From 46a1727b8078291814e94cb17251c8d5478ff17a Mon Sep 17 00:00:00 2001 From: Leonardo Guilherme de Freitas Date: Sun, 10 Feb 2013 12:48:03 -0200 Subject: [PATCH 001/297] Update Readme.txt --- Readme.txt | 133 +++++++++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 59 deletions(-) diff --git a/Readme.txt b/Readme.txt index 78ef49eae..45d4b61e0 100644 --- a/Readme.txt +++ b/Readme.txt @@ -7,96 +7,111 @@ Douml version 1.0b 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. + + 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 + 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: + 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. + 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: + 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. + -- 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 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 + -- 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. + -- 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. + -- 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 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. + -- 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. + -- "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 + -- 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. + -- 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. + -- 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. + -- 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 + -- 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). + -- 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 - + -- 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. + 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. + 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/ + http://sourceforge.net/projects/douml/ + Contact email: - doumleditor@gmail.com - !!! CONTRIBUTORS NEEDED!!! - + 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 - From f2545b17cb4bc678fb4ed65ddd6c4162bb075035 Mon Sep 17 00:00:00 2001 From: Leonardo Guilherme de Freitas Date: Sun, 10 Feb 2013 17:31:38 -0200 Subject: [PATCH 002/297] Moving Readme.txt to README.md --- README.md | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++ Readme.txt | 117 ---------------------------------------------- 2 files changed, 134 insertions(+), 117 deletions(-) create mode 100644 README.md delete mode 100644 Readme.txt diff --git a/README.md b/README.md new file mode 100644 index 000000000..b972764c5 --- /dev/null +++ b/README.md @@ -0,0 +1,134 @@ +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 + +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 +--------- + + * Under Windows: + * 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/Readme.txt b/Readme.txt deleted file mode 100644 index 45d4b61e0..000000000 --- a/Readme.txt +++ /dev/null @@ -1,117 +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 From b7b9e6cbbf36fb7f3bfcd050eafc561cd004113f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Feb 2013 18:57:18 +0400 Subject: [PATCH 003/297] fixing problem with settings file --- bin/GenerationSettings_PastDefines.ini | 3 +++ bin/settings.ini | 2 +- genplugouts/deploy/Main.cpp | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/GenerationSettings_PastDefines.ini b/bin/GenerationSettings_PastDefines.ini index 07fd1a7ba..d01dd6e5b 100644 --- a/bin/GenerationSettings_PastDefines.ini +++ b/bin/GenerationSettings_PastDefines.ini @@ -1,4 +1,7 @@ [General] +test=test + +[Main] compatibility_save=1 CPP_H_CONTENT="#ifndef ${NAMESPACE}_${NAME}_H diff --git a/bin/settings.ini b/bin/settings.ini index 3a3bf3ecf..50d48946b 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -2,7 +2,7 @@ test=test [Main] -compatibility_save=1 +compatibility_save=0 fileformat=77 encoding=UTF-8 diff --git a/genplugouts/deploy/Main.cpp b/genplugouts/deploy/Main.cpp index 4c70b2f10..3f7890a3e 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(); From e4b63f656347a1f3f80afcdf74820d80608c26a4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Feb 2013 19:03:10 +0400 Subject: [PATCH 004/297] more problems with ini file --- bin/GenerationSettings_PastDefines.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/GenerationSettings_PastDefines.ini b/bin/GenerationSettings_PastDefines.ini index d01dd6e5b..b201a246b 100644 --- a/bin/GenerationSettings_PastDefines.ini +++ b/bin/GenerationSettings_PastDefines.ini @@ -5,7 +5,7 @@ test=test compatibility_save=1 CPP_H_CONTENT="#ifndef ${NAMESPACE}_${NAME}_H -${NAMESPACE}_${NAME}_H +\#define ${NAMESPACE}_${NAME}_H ${comment} ${includes} From ecdc0bcb72b33b627ddd4277e59d7462701f6e85 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Feb 2013 19:30:04 +0400 Subject: [PATCH 005/297] . --- bin/settings.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/settings.ini b/bin/settings.ini index 50d48946b..3a3bf3ecf 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -2,7 +2,7 @@ test=test [Main] -compatibility_save=0 +compatibility_save=1 fileformat=77 encoding=UTF-8 From eb5f0630ae10a64e0600aa05a2effb32bae605ba Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Feb 2013 20:05:46 +0400 Subject: [PATCH 006/297] debugging deploy --- genplugouts/deploy/UmlCom.cpp | 6 +- src/main.cpp | 4 +- src/misc/GenerationSettings.cpp | 644 +++++++++++++++++--------------- 3 files changed, 359 insertions(+), 295 deletions(-) diff --git a/genplugouts/deploy/UmlCom.cpp b/genplugouts/deploy/UmlCom.cpp index fec65a7b1..8a3d3433a 100644 --- a/genplugouts/deploy/UmlCom.cpp +++ b/genplugouts/deploy/UmlCom.cpp @@ -190,7 +190,11 @@ void UmlCom::read_buffer(unsigned int len) QLOG_INFO() << "Allocated address" << (size_t) buffer_in; for (;;) { - while(sock->bytesAvailable() != len); + while(sock->bytesAvailable() < len) + { + int available = sock->bytesAvailable(); + QLOG_INFO() << sock->bytesAvailable(); + } nread = sock->readBlock(p, len); p += nread; diff --git a/src/main.cpp b/src/main.cpp index deef1cc78..0f2c8ec32 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char ** argv) QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); -#ifdef DEBUG +//#ifdef DEBUG QsLogging::Logger & logger = QsLogging::Logger::instance(); logger.setLoggingLevel(QsLogging::TraceLevel); QDir dir; @@ -86,7 +86,7 @@ int main(int argc, char ** argv) logger.addDestination(debugDestination.get()); logger.addDestination(fileDestination.get()); QLOG_INFO() << "Starting the log"; -#endif +//#endif An factory; diff --git a/src/misc/GenerationSettings.cpp b/src/misc/GenerationSettings.cpp index 9431c207b..915cf644b 100644 --- a/src/misc/GenerationSettings.cpp +++ b/src/misc/GenerationSettings.cpp @@ -369,309 +369,369 @@ 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) + 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"); + + #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 "\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}${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; + #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.findIndex("void") == -1) umltypes.append("void"); - cpp_includes.types.clear(); - cpp_includes.includes.clear(); - - cpp_includes.types.append("vector"); - cpp_includes.includes.append("#include \nusing namespace std;"); - cpp_includes.types.append("list"); - cpp_includes.includes.append("#include \nusing namespace std;"); - cpp_includes.types.append("map"); - cpp_includes.includes.append("#include \nusing namespace std;"); - cpp_includes.types.append("string"); - cpp_includes.includes.append("#include \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 \nusing namespace std;"); + cpp_includes.types.append("list"); + cpp_includes.includes.append("#include \nusing namespace std;"); + cpp_includes.types.append("map"); + cpp_includes.includes.append("#include \nusing namespace std;"); + cpp_includes.types.append("string"); + cpp_includes.includes.append("#include \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) From d3e2e65b436d4825535f461b92d81244969162aa Mon Sep 17 00:00:00 2001 From: zeks Date: Thu, 14 Feb 2013 00:21:43 +0400 Subject: [PATCH 007/297] now I only need to get rif of excess tabs --- bin/GenerationSettings_PastDefines.ini | 2 +- genplugouts/deploy/UmlCom.cpp | 9 +++------ src/CppGenerator/CppRefType.cpp | 14 +++++++++----- src/CppGenerator/UmlClassMember.cpp | 3 ++- src/CppGenerator/UmlOperation.cpp | 3 +-- src/misc/mystr.h | 10 +++++----- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/bin/GenerationSettings_PastDefines.ini b/bin/GenerationSettings_PastDefines.ini index b201a246b..c0fd7878f 100644 --- a/bin/GenerationSettings_PastDefines.ini +++ b/bin/GenerationSettings_PastDefines.ini @@ -5,7 +5,7 @@ test=test compatibility_save=1 CPP_H_CONTENT="#ifndef ${NAMESPACE}_${NAME}_H -\#define ${NAMESPACE}_${NAME}_H +\\#define ${NAMESPACE}_${NAME}_H ${comment} ${includes} diff --git a/genplugouts/deploy/UmlCom.cpp b/genplugouts/deploy/UmlCom.cpp index 8a3d3433a..52d84df0f 100644 --- a/genplugouts/deploy/UmlCom.cpp +++ b/genplugouts/deploy/UmlCom.cpp @@ -190,12 +190,9 @@ void UmlCom::read_buffer(unsigned int len) QLOG_INFO() << "Allocated address" << (size_t) buffer_in; for (;;) { - while(sock->bytesAvailable() < len) - { - int available = sock->bytesAvailable(); - QLOG_INFO() << sock->bytesAvailable(); - } - nread = sock->readBlock(p, len); + sock->readBlock(p, remainder); +// QByteArray arr(p); +// QLOG_INFO() << arr; p += nread; QLOG_INFO() << "nread = " + QString::number(nread); diff --git a/src/CppGenerator/CppRefType.cpp b/src/CppGenerator/CppRefType.cpp index e4194720d..ff2496daa 100644 --- a/src/CppGenerator/CppRefType.cpp +++ b/src/CppGenerator/CppRefType.cpp @@ -72,9 +72,8 @@ bool CppRefType::add(UmlClass * cl, Q3PtrList & l, for (ref = l.first(); ref; ref = l.next()) { // 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; @@ -202,11 +201,13 @@ void CppRefType::compute(Q3PtrList & dependencies, CppRefType * ref; - for (ref = dependencies.first(); ref != 0; ref = dependencies.next()) { + for (ref = dependencies.first(); ref != 0; ref = dependencies.next()) + { 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 +220,9 @@ void CppRefType::compute(Q3PtrList & 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; @@ -246,6 +249,7 @@ void CppRefType::compute(Q3PtrList & dependencies, srcform = hform; } else { + QString className = cl->name(); WrapperStr st = cl->cpp_stereotype(); if ((st == "enum") || (st == "typedef")) diff --git a/src/CppGenerator/UmlClassMember.cpp b/src/CppGenerator/UmlClassMember.cpp index 35528ccf0..4fb059d53 100644 --- a/src/CppGenerator/UmlClassMember.cpp +++ b/src/CppGenerator/UmlClassMember.cpp @@ -232,7 +232,8 @@ bool UmlClassMember::compute_dependency(Q3PtrList & 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/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp index c1812c983..2cf98b17b 100644 --- a/src/CppGenerator/UmlOperation.cpp +++ b/src/CppGenerator/UmlOperation.cpp @@ -250,7 +250,7 @@ void UmlOperation::compute_dependency(Q3PtrList & 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,7 +302,6 @@ void UmlOperation::compute_dependency(Q3PtrList & dependencies, p += 1; } } - CppRefType::add(ts, dependencies, incl || all_in_h); } } diff --git a/src/misc/mystr.h b/src/misc/mystr.h index cc5976a75..418fcdb17 100644 --- a/src/misc/mystr.h +++ b/src/misc/mystr.h @@ -152,12 +152,12 @@ class WrapperStr WrapperStr& replace(int pos, int len, const char* c) { - wrappedString.replace(pos, len, c); + wrappedString = wrappedString.replace(pos, len, c); return *this; } WrapperStr& insert(int pos, const char* c) { - wrappedString.insert(pos, c); + wrappedString = wrappedString.insert(pos, c); return *this; } WrapperStr left(int len) const @@ -183,7 +183,7 @@ class WrapperStr WrapperStr& remove(int pos, int len) { - wrappedString.remove(pos, len); + wrappedString = wrappedString.remove(pos, len); return *this; } WrapperStr mid(int pos, int len = -1) const @@ -192,12 +192,12 @@ class WrapperStr } WrapperStr& setNum(int num) { - wrappedString.setNum(num); + wrappedString = wrappedString.setNum(num); return *this; } void truncate(int pos) { - wrappedString.left(pos); + wrappedString = wrappedString.left(pos); } QString upper() const { From 036ec1bfe4ceedc51e792428cd90fca9ad423a76 Mon Sep 17 00:00:00 2001 From: zeks Date: Thu, 14 Feb 2013 00:29:09 +0400 Subject: [PATCH 008/297] these are proper defaults --- src/misc/GenerationSettings.cpp | 94 ++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/src/misc/GenerationSettings.cpp b/src/misc/GenerationSettings.cpp index 915cf644b..b0a6c42b2 100644 --- a/src/misc/GenerationSettings.cpp +++ b/src/misc/GenerationSettings.cpp @@ -390,57 +390,57 @@ void GenerationSettings::init() builtins[13].set("double", "double", "double", "double"); builtins[14].set("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}" +#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}"; +#define JAVA_SRC_CONTENT "${comment}\n\ +${package}\n\ +${imports}\n\ +${definition}"; java_src_content = JAVA_SRC_CONTENT; java_extension = "java"; - #define PHP_SRC_CONTENT "\n"; +#define PHP_SRC_CONTENT "\n"; php_src_content = PHP_SRC_CONTENT; php_extension = "php"; - #define PYTHON_SRC_CONTENT "${comment}\n\ - ${import}\n\ - ${definition}"; +#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" +#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"; @@ -493,10 +493,10 @@ void GenerationSettings::init() 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" +#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; @@ -526,7 +526,7 @@ void GenerationSettings::init() cpp_force_namespace_gen = FALSE; cpp_inline_force_incl_in_h = FALSE; cpp_javadoc_comment = FALSE; - #define CPP_INDENT_VISIBILITY " " +#define CPP_INDENT_VISIBILITY " " cpp_indent_visibility = CPP_INDENT_VISIBILITY; java_class_decl = "${comment}${@}${visibility}${final}${abstract}class ${name}${extends}${implements} {\n${members}}\n"; @@ -544,10 +544,10 @@ void GenerationSettings::init() }\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" +#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; From 7723668db70c2a9d9c416b929916f56542d97d89 Mon Sep 17 00:00:00 2001 From: zeks Date: Thu, 14 Feb 2013 00:38:58 +0400 Subject: [PATCH 009/297] HOPEFULLY this will fix ****ing icons >_< --- bin/GenerationSettings_PastDefines.ini | 99 -------------------------- src/Factories/EdgeToolBarCreation.cpp | 18 ++--- 2 files changed, 9 insertions(+), 108 deletions(-) delete mode 100644 bin/GenerationSettings_PastDefines.ini diff --git a/bin/GenerationSettings_PastDefines.ini b/bin/GenerationSettings_PastDefines.ini deleted file mode 100644 index c0fd7878f..000000000 --- a/bin/GenerationSettings_PastDefines.ini +++ /dev/null @@ -1,99 +0,0 @@ -[General] -test=test - -[Main] -compatibility_save=1 - -CPP_H_CONTENT="#ifndef ${NAMESPACE}_${NAME}_H -\\#define ${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=""; - -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/src/Factories/EdgeToolBarCreation.cpp b/src/Factories/EdgeToolBarCreation.cpp index ff5feb855..caf084df8 100644 --- a/src/Factories/EdgeToolBarCreation.cpp +++ b/src/Factories/EdgeToolBarCreation.cpp @@ -49,18 +49,18 @@ EdgeMenuToolBar * CreateLimitedDialogMenu() layout->setContentsMargins(0, 0, 0, 0); QLabel * label = new QLabel(); - label->setPixmap(QIcon("../src/icons/mouse_control.png").pixmap()); + label->setPixmap(QIcon(":/root/icons/mouse_control.png").pixmap()); layout->addWidget(label); dragArea->setLayout(layout); QPushButton * okayElement = new QPushButton(); - okayElement->setIcon(QIcon(":/root/src/icons/accept.png")); + okayElement->setIcon(QIcon(":/root/icons/accept.png")); okayElement->setName("OkayElement"); okayElement->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); okayElement->setBaseSize(defaultButtonSize, defaultButtonSize); QPushButton * cancelElement = new QPushButton(); - cancelElement->setIcon(QIcon(":/root/src/icons/reject.png")); + cancelElement->setIcon(QIcon(":/root/icons/reject.png")); cancelElement->setName("CancelElement"); okayElement->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); cancelElement->setBaseSize(defaultButtonSize, defaultButtonSize); @@ -97,30 +97,30 @@ EdgeMenuToolBar * CreateClassDialogMenu() QHBoxLayout * layout = new QHBoxLayout(); layout->setContentsMargins(0, 0, 0, 0); QLabel * label = new QLabel(); - label->setPixmap(QIcon(":/root/src/icons/mouse_control.png").pixmap()); + label->setPixmap(QIcon(":/root/icons/mouse_control.png").pixmap()); 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->setIcon(QIcon(":/root/icons/accept.png")); okayElement->setName("OkayElement"); okayElement->setBaseSize(defaultButtonSize, defaultButtonSize); QPushButton * nextElement = new QPushButton(); - nextElement->setIcon(QIcon(":/root/src/icons/up.png")); + nextElement->setIcon(QIcon(":/root/icons/up.png")); nextElement->setName("NextElement"); nextElement->setBaseSize(defaultButtonSize, defaultButtonSize); QPushButton * previousElement = new QPushButton(); - previousElement->setIcon(QIcon(":/root/src/icons/down.png")); + previousElement->setIcon(QIcon(":/root/icons/down.png")); previousElement->setName("PreviousElement"); previousElement->setBaseSize(defaultButtonSize, defaultButtonSize); QPushButton * cancelElement = new QPushButton(); - cancelElement->setIcon(QIcon(":/root/src/icons/reject.png")); + cancelElement->setIcon(QIcon(":/root/icons/reject.png")); cancelElement->setName("CancelElement"); cancelElement->setBaseSize(defaultButtonSize, defaultButtonSize); From 4d0e4eb60c676aba416e768e605f89c875dd9752 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Feb 2013 16:40:55 +0400 Subject: [PATCH 010/297] 1. Unmark all will now correctly set "Generate" label color to blue 2. Abstract operations' definitions will be saved on project save. This is required for proper propagation when changes are made in the abstract operations. To complement this - generators (currently cpp gen only) will skip body tag if isAbstract is true --- src/CppGenerator/UmlOperation.cpp | 8 +++++++- src/browser/BrowserNode.cpp | 5 +++++ src/data/OperationData.cpp | 16 +++++++++++----- src/data/OperationData.h | 8 +++++--- src/dialog/OperationDialog.cpp | 13 ++++++++++--- 5 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/CppGenerator/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp index 2cf98b17b..932712390 100644 --- a/src/CppGenerator/UmlOperation.cpp +++ b/src/CppGenerator/UmlOperation.cpp @@ -624,6 +624,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; @@ -657,11 +661,13 @@ const char * UmlOperation::generate_body(QTextStream & fs, 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); diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index d5384eaf5..58e5bb1b5 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1192,6 +1192,11 @@ 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(); } void BrowserNode::move(BrowserNode * bn, BrowserNode * after) diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 446eb12a4..0302ca5b9 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -211,10 +211,16 @@ void OperationData::PropagateFrom(const OperationData * model, bool goBack, QLis 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); + //todo need to check why abstract operation sometimes end with empty definition + //if(this->is_abstract && model->is_abstract) + //bool defAllowed = true;//!model->is_abstract || (model->is_abstract && this->is_abstract); +// if(defAllowed) +// { + 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); +// } return_type = model->return_type; depend_on(return_type.type); @@ -3432,7 +3438,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); diff --git a/src/data/OperationData.h b/src/data/OperationData.h index 9017a41e5..5cac8e39f 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -276,11 +276,13 @@ 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;} QString default_cpp_decl(const QString & name); diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 5038ae182..778d5d3d2 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -499,6 +499,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); @@ -521,6 +524,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); @@ -3345,7 +3349,8 @@ bool OperationDialog::SaveData(OperationData *oper) // C++ - if (cpp_undef) { + if (cpp_undef) + { oper->cpp_decl = QString(); oper->cpp_def.assign(QString(), TRUE); @@ -3353,7 +3358,8 @@ bool OperationDialog::SaveData(OperationData *oper) oper->new_body(QString(), 'c'); } else { - if (oper->is_get_or_set) { + if (oper->is_get_or_set) + { oper->cpp_name_spec = cppTab->ui->leCppNamespec->text().stripWhiteSpace(); oper->cpp_body.length = 0; oper->cpp_get_set_frozen = cppTab->ui->cbCppFrozen->isChecked(); @@ -3362,7 +3368,8 @@ 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().find("${body}") != -1)) + { if (cppbody != oldcppbody) oper->new_body(cppbody, 'c'); } From 4bbc1d28e1184ef214d2e41b2c07a8257eedff73 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Feb 2013 18:10:28 +0400 Subject: [PATCH 011/297] some more fixes for propagation to/from abstract operations --- src/data/OperationData.cpp | 14 +++----- src/dialog/OperationDialog.cpp | 63 +++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 0302ca5b9..12b8835df 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -211,16 +211,10 @@ void OperationData::PropagateFrom(const OperationData * model, bool goBack, QLis python_decorator = model->python_decorator; idl_decl = model->idl_decl; - //todo need to check why abstract operation sometimes end with empty definition - //if(this->is_abstract && model->is_abstract) - //bool defAllowed = true;//!model->is_abstract || (model->is_abstract && this->is_abstract); -// if(defAllowed) -// { - 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, FALSE; + java_def = model->java_def, FALSE; + php_def = model->php_def, FALSE; + python_def =model->python_def, FALSE; return_type = model->return_type; depend_on(return_type.type); diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 778d5d3d2..664cf6609 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -2063,8 +2063,8 @@ void OperationDialog::cpp_def_from_decl() // manage abstract - if ((dcl.find("${abstract}") == -1) || // abstract removed - !abstract_cb->isChecked()) { + if (/*(dcl.find("${abstract}") == -1) || !abstract_cb->isChecked()*/true) + { // probably not abstract int index1; int index2; @@ -2126,39 +2126,44 @@ void OperationDialog::cpp_def_from_decl() index1 = index2; } } - QList failedTags; - for(auto tag : tags) - { - //first we try to find left context in the new definition - QRegExp rx(QRegExp::escape(tag.leftContext)); - int index = rx.indexIn(def); - if(index != -1) +// if(!oper->is_abstract) +// { + QList failedTags; + for(auto tag : tags) { - def.replace(tag.leftContext, tag.leftContext + tag.tag); - continue; + //first we try to find left context in the new definition + QRegExp rx(QRegExp::escape(tag.leftContext)); + int index = rx.indexIn(def); + if(index != -1) + { + def.replace(tag.leftContext, tag.leftContext + tag.tag); + continue; + } + // next we try right context + rx.setPattern(QRegExp::escape(tag.leftContext)); + index = rx.indexIn(def); + if(index != -1) + { + def.replace(tag.rightContext, tag.tag + tag.leftContext); + continue; + } + failedTags.append(tag); } - // next we try right context - rx.setPattern(QRegExp::escape(tag.leftContext)); - index = rx.indexIn(def); - if(index != -1) + if(failedTags.size() > 0) { - def.replace(tag.rightContext, tag.tag + tag.leftContext); - continue; + QString tagString; + for(auto tag : failedTags) + tagString.append(tag.tag + tr(",")); + if(tagString.length() > 0) + tagString.chop(1); + QMessageBox::critical(0, tr("Warning!"), tr("Could not find correct place for these tags: " + tagString), QMessageBox::Ok); } - failedTags.append(tag); - } - if(failedTags.size() > 0) - { - QString tagString; - for(auto tag : failedTags) - tagString.append(tag.tag + tr(",")); - if(tagString.length() > 0) - tagString.chop(1); - QMessageBox::critical(0, tr("Warning!"), tr("Could not find correct place for these tags: " + tagString), QMessageBox::Ok); - } + //} // update def cppTab->ui->edCppDefProto->setText(def); + if(oper->is_abstract) + return; cpp_update_def(); } @@ -2402,7 +2407,9 @@ void OperationDialog::cpp_update_def() s += indent; } else if (*p == '@') + { manage_alias(oper->browser_node, p, s, kvtable); + } else s += *p++; } From 60e6b3e11d392e9dde18b3f10fe332c4844db987 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Feb 2013 18:18:10 +0400 Subject: [PATCH 012/297] saved tab in operation dialog was rather annoying. removing this --- src/dialog/OperationDialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 664cf6609..8b460e0ef 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -100,6 +100,8 @@ OperationDialog::OperationDialog(OperationData * o, DrawingLanguage ) InitGui(); FillGuiElements(oper); + + connect(this, SIGNAL(currentChanged(QWidget *)), this, SLOT(update_all_tabs(QWidget *))); open_dialog(this); @@ -7501,7 +7503,9 @@ QSharedPointer OperationDialog::Instance(OperationData * o, Dra instance = QSharedPointer(new OperationDialog(o, l)); else { instance->drawingLanguage = l; + instance->ChangeTab(0); instance->FillGuiElements(o); + } return instance; From 5dd3d76e0257c84e7d3dec65f12ec92945d1055e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Feb 2013 19:24:24 +0400 Subject: [PATCH 013/297] fixed all generators to not produce bodies of abstract functions --- src/JavaCat/UmlExtraClassMember.cpp | 8 ++++---- src/JavaGenerator/UmlOperation.cpp | 3 +++ src/PhpGenerator/UmlOperation.cpp | 2 ++ src/PythonGenerator/UmlOperation.cpp | 3 +++ src/Tools/UmlBaseOperation.cpp | 2 -- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/JavaCat/UmlExtraClassMember.cpp b/src/JavaCat/UmlExtraClassMember.cpp index 48a0f71df..f933ef494 100644 --- a/src/JavaCat/UmlExtraClassMember.cpp +++ b/src/JavaCat/UmlExtraClassMember.cpp @@ -36,10 +36,10 @@ #include // 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 & expected_order) diff --git a/src/JavaGenerator/UmlOperation.cpp b/src/JavaGenerator/UmlOperation.cpp index 8353bc817..a317918f0 100644 --- a/src/JavaGenerator/UmlOperation.cpp +++ b/src/JavaGenerator/UmlOperation.cpp @@ -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; diff --git a/src/PhpGenerator/UmlOperation.cpp b/src/PhpGenerator/UmlOperation.cpp index 626476306..dc66516e6 100644 --- a/src/PhpGenerator/UmlOperation.cpp +++ b/src/PhpGenerator/UmlOperation.cpp @@ -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; diff --git a/src/PythonGenerator/UmlOperation.cpp b/src/PythonGenerator/UmlOperation.cpp index de7a13a80..267121145 100644 --- a/src/PythonGenerator/UmlOperation.cpp +++ b/src/PythonGenerator/UmlOperation.cpp @@ -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; diff --git a/src/Tools/UmlBaseOperation.cpp b/src/Tools/UmlBaseOperation.cpp index 53af10467..52d6cb9d7 100644 --- a/src/Tools/UmlBaseOperation.cpp +++ b/src/Tools/UmlBaseOperation.cpp @@ -17,8 +17,6 @@ unsigned api_format(bool useTrueFormat) { - 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(); From 746269355d601bcda2af1784d5c0bc41a7f78b2e Mon Sep 17 00:00:00 2001 From: zeks Date: Thu, 14 Feb 2013 22:04:35 +0400 Subject: [PATCH 014/297] fxies mini toolbar crash --- src/data/OperationData.cpp | 8 ++++---- src/dialog/edgemenudialogbase.cpp | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 12b8835df..29f43296d 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -211,10 +211,10 @@ void OperationData::PropagateFrom(const OperationData * model, bool goBack, QLis python_decorator = model->python_decorator; idl_decl = model->idl_decl; - cpp_def = model->cpp_def, FALSE; - java_def = model->java_def, FALSE; - php_def = model->php_def, FALSE; - python_def =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); diff --git a/src/dialog/edgemenudialogbase.cpp b/src/dialog/edgemenudialogbase.cpp index ce7541f2d..13fa7cd3d 100644 --- a/src/dialog/edgemenudialogbase.cpp +++ b/src/dialog/edgemenudialogbase.cpp @@ -55,11 +55,12 @@ void EdgeMenuDialogBase::PickNextSibling() { nextNode = dynamic_cast(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(); From 0546290f8c14c62f42c00e1afe502cbe17aba68d Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 16 Feb 2013 15:15:17 +0400 Subject: [PATCH 015/297] DO NOT TRY TO BUILD THIS COMMIT. It is only here so that I don't lose work to some freak accident. Added a generic table/tree model library to ease creation of interface elements. Added a rotating "last visited class" treeview that allows to select classes back in main view. Added a search for rotating listview. --- src/CustomWidgets/EdgeMenuToolBar.cpp | 2 +- src/CustomWidgets/MultiPurposeDragArea.cpp | 2 +- src/CustomWidgets/MultiPurposeDragArea.h | 2 +- src/Factories/DialogConnections.h | 2 +- src/Factories/EdgeToolBarCreation.h | 2 +- .../L_UniversalModels/L_UniversalModels.pro | 62 + .../UML/models/128042.diagram | 33 + .../UML/models/134570.diagram | 169 + .../UML/models/141098.diagram | 16 + .../UML/models/141226.diagram | 26 + .../UML/models/141354.diagram | 55 + .../UML/models/141482.diagram | 103 + .../UML/models/141866.diagram | 67 + .../UML/models/141994.diagram | 87 + .../UML/models/142122.diagram | 151 + .../UML/models/143018.bodies | 13 + .../UML/models/143530.bodies | 18 + .../UML/models/143658.bodies | 97 + .../UML/models/147626.diagram | 69 + .../UML/models/148010.diagram | 25 + .../UML/models/148650.diagram | 51 + .../UML/models/154154.diagram | 333 ++ .../UML/models/155178.diagram | 25 + .../UML/models/160682.diagram | 157 + .../UML/models/161706.diagram | 287 ++ .../UML/models/167210.diagram | 16 + .../UML/models/168362.diagram | 74 + .../UML/models/168490.diagram | 66 + .../UML/models/168618.diagram | 80 + .../UML/models/168746.diagram | 75 + .../UML/models/175402.diagram | 129 + .../UML/models/175530.diagram | 54 + .../UML/models/175658.diagram | 25 + .../UML/models/175786.diagram | 94 + .../UML/models/175914.diagram | 138 + .../UML/models/176042.diagram | 43 + .../UML/models/180522.diagram | 48 + .../UML/models/180650.diagram | 3 + .../UML/models/182570.diagram | 16 + .../UML/models/187178.diagram | 157 + .../UML/models/187306.diagram | 16 + .../UML/models/187434.diagram | 347 +++ .../UML/models/189098.diagram | 34 + .../UML/models/193962.diagram | 105 + .../UML/models/195626.diagram | 24 + .../UML/models/200490.diagram | 71 + src/Libs/L_UniversalModels/UML/models/201002 | 2721 +++++++++++++++++ .../UML/models/202282.diagram | 34 + .../UML/models/208810.diagram | 105 + .../UML/models/215338.diagram | 20 + .../UML/models/215466.diagram | 48 + .../UML/models/221994.diagram | 121 + .../UML/models/222122.diagram | 49 + .../UML/models/228650.diagram | 50 + .../UML/models/228778.diagram | 83 + .../UML/models/228906.diagram | 37 + .../UML/models/229034.diagram | 76 + .../UML/models/229162.diagram | 54 + .../UML/models/229290.diagram | 76 + .../UML/models/229418.diagram | 11 + .../UML/models/235946.diagram | 43 + .../UML/models/242986.diagram | 7 + .../UML/models/249642.diagram | 34 + .../UML/models/269226.diagram | 43 + .../UML/models/275754.diagram | 54 + .../UML/models/282282.diagram | 88 + .../UML/models/288810.diagram | 7 + .../UML/models/288938.diagram | 3 + .../UML/models/295466.diagram | 7 + .../UML/models/301994.diagram | 30 + .../UML/models/308522.diagram | 56 + .../UML/models/315050.diagram | 46 + .../UML/models/321578.diagram | 16 + .../UML/models/321706.diagram | 11 + .../UML/models/328234.diagram | 16 + .../UML/models/334762.diagram | 57 + .../L_UniversalModels/UML/models/34.session | 55 + .../UML/models/341290.diagram | 16 + .../L_UniversalModels/UML/models/42.session | 12 + .../L_UniversalModels/UML/models/93.session | 20 + .../L_UniversalModels/UML/models/cpp_includes | 135 + .../UML/models/generation_settings | 407 +++ .../L_UniversalModels/UML/models/idl_includes | 1 + .../L_UniversalModels/UML/models/java_imports | 1 + .../L_UniversalModels/UML/models/models.prj | 59 + .../UML/models/python_imports | 1 + .../L_UniversalModels/UML/models/stereotypes | 59 + src/Libs/L_UniversalModels/UML/models/tools | 34 + .../include/AdaptingTableModel.h | 79 + .../include/AdaptingTableModelPrivate.h | 51 + .../include/ItemController.h | 175 ++ .../include/TableDataInterface.h | 63 + .../include/TableDataListHolder.h | 181 ++ src/Libs/L_UniversalModels/include/TreeItem.h | 391 +++ .../include/TreeItemInterface.h | 91 + .../L_UniversalModels/include/TreeModel.h | 81 + .../include/l_tree_controller_global.h | 38 + .../include/treeitemfunctions.h | 172 ++ .../include/treeviewfunctions.h | 64 + .../include/treeviewtemplatefunctions.h | 314 ++ .../src/AdaptingTableModel.cpp | 152 + .../src/AdaptingTableModelPrivate.cpp | 41 + .../L_UniversalModels/src/ItemController.cpp | 27 + .../src/TableDataInterface.cpp | 39 + .../src/TreeItemInterface.cpp | 39 + src/Libs/L_UniversalModels/src/TreeModel.cpp | 288 ++ .../src/treeviewfunctions.cpp | 71 + .../src/treeviewtemplatefunctions.cpp | 29 + src/UMl/UMl.prj | 41 + src/UMl/cpp_includes | 13 + src/UMl/generation_settings | 312 ++ src/UMl/idl_includes | 1 + src/UMl/java_imports | 1 + src/UMl/python_imports | 1 + src/UMl/stereotypes | 59 + src/UMl/tools | 18 + src/browser/BrowserClass.h | 3 +- src/browser/BrowserNode.h | 1 + src/diagram/UmlWindow.cpp | 197 +- src/diagram/UmlWindow.h | 41 +- src/dialog/EdgeMenuDialog.h | 2 +- src/dialog/edgemenudialogbase.cpp | 2 +- src/dialog/edgemenudialogbase.h | 2 +- src/dialog/edgemenudialogqt4.h | 2 +- src/douml.pro | 4 +- src/misc/ClipboardManager.cpp | 2 +- src/misc/ClipboardManager.h | 2 +- src/tagmanagement/cpptagmanagement.cpp | 2 +- src/tagmanagement/cpptagmanagement.h | 2 +- src/ui/constructorinitializerdialog.cpp | 2 +- src/ui/constructorinitializerdialog.h | 2 +- src/ui/operationwidgetcpp.cpp | 2 +- src/ui/operationwidgetcpp.h | 2 +- 133 files changed, 11348 insertions(+), 26 deletions(-) create mode 100644 src/Libs/L_UniversalModels/L_UniversalModels.pro create mode 100644 src/Libs/L_UniversalModels/UML/models/128042.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/134570.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/141098.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/141226.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/141354.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/141482.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/141866.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/141994.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/142122.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/143018.bodies create mode 100644 src/Libs/L_UniversalModels/UML/models/143530.bodies create mode 100644 src/Libs/L_UniversalModels/UML/models/143658.bodies create mode 100644 src/Libs/L_UniversalModels/UML/models/147626.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/148010.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/148650.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/154154.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/155178.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/160682.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/161706.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/167210.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/168362.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/168490.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/168618.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/168746.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/175402.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/175530.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/175658.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/175786.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/175914.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/176042.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/180522.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/180650.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/182570.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/187178.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/187306.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/187434.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/189098.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/193962.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/195626.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/200490.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/201002 create mode 100644 src/Libs/L_UniversalModels/UML/models/202282.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/208810.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/215338.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/215466.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/221994.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/222122.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/228650.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/228778.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/228906.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/229034.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/229162.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/229290.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/229418.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/235946.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/242986.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/249642.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/269226.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/275754.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/282282.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/288810.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/288938.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/295466.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/301994.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/308522.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/315050.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/321578.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/321706.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/328234.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/334762.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/34.session create mode 100644 src/Libs/L_UniversalModels/UML/models/341290.diagram create mode 100644 src/Libs/L_UniversalModels/UML/models/42.session create mode 100644 src/Libs/L_UniversalModels/UML/models/93.session create mode 100644 src/Libs/L_UniversalModels/UML/models/cpp_includes create mode 100644 src/Libs/L_UniversalModels/UML/models/generation_settings create mode 100644 src/Libs/L_UniversalModels/UML/models/idl_includes create mode 100644 src/Libs/L_UniversalModels/UML/models/java_imports create mode 100644 src/Libs/L_UniversalModels/UML/models/models.prj create mode 100644 src/Libs/L_UniversalModels/UML/models/python_imports create mode 100644 src/Libs/L_UniversalModels/UML/models/stereotypes create mode 100644 src/Libs/L_UniversalModels/UML/models/tools create mode 100644 src/Libs/L_UniversalModels/include/AdaptingTableModel.h create mode 100644 src/Libs/L_UniversalModels/include/AdaptingTableModelPrivate.h create mode 100644 src/Libs/L_UniversalModels/include/ItemController.h create mode 100644 src/Libs/L_UniversalModels/include/TableDataInterface.h create mode 100644 src/Libs/L_UniversalModels/include/TableDataListHolder.h create mode 100644 src/Libs/L_UniversalModels/include/TreeItem.h create mode 100644 src/Libs/L_UniversalModels/include/TreeItemInterface.h create mode 100644 src/Libs/L_UniversalModels/include/TreeModel.h create mode 100644 src/Libs/L_UniversalModels/include/l_tree_controller_global.h create mode 100644 src/Libs/L_UniversalModels/include/treeitemfunctions.h create mode 100644 src/Libs/L_UniversalModels/include/treeviewfunctions.h create mode 100644 src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h create mode 100644 src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp create mode 100644 src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp create mode 100644 src/Libs/L_UniversalModels/src/ItemController.cpp create mode 100644 src/Libs/L_UniversalModels/src/TableDataInterface.cpp create mode 100644 src/Libs/L_UniversalModels/src/TreeItemInterface.cpp create mode 100644 src/Libs/L_UniversalModels/src/TreeModel.cpp create mode 100644 src/Libs/L_UniversalModels/src/treeviewfunctions.cpp create mode 100644 src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp create mode 100644 src/UMl/UMl.prj create mode 100644 src/UMl/cpp_includes create mode 100644 src/UMl/generation_settings create mode 100644 src/UMl/idl_includes create mode 100644 src/UMl/java_imports create mode 100644 src/UMl/python_imports create mode 100644 src/UMl/stereotypes create mode 100644 src/UMl/tools diff --git a/src/CustomWidgets/EdgeMenuToolBar.cpp b/src/CustomWidgets/EdgeMenuToolBar.cpp index 37e048b72..68cdcea48 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. // diff --git a/src/CustomWidgets/MultiPurposeDragArea.cpp b/src/CustomWidgets/MultiPurposeDragArea.cpp index 2c027eb83..2a58ed4cf 100644 --- a/src/CustomWidgets/MultiPurposeDragArea.cpp +++ b/src/CustomWidgets/MultiPurposeDragArea.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/CustomWidgets/MultiPurposeDragArea.h b/src/CustomWidgets/MultiPurposeDragArea.h index c2ea89ccf..484cfe641 100644 --- a/src/CustomWidgets/MultiPurposeDragArea.h +++ b/src/CustomWidgets/MultiPurposeDragArea.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Factories/DialogConnections.h b/src/Factories/DialogConnections.h index 72ae07aa9..b62c1f9ae 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. // diff --git a/src/Factories/EdgeToolBarCreation.h b/src/Factories/EdgeToolBarCreation.h index 867b95183..fd8be8a44 100644 --- a/src/Factories/EdgeToolBarCreation.h +++ b/src/Factories/EdgeToolBarCreation.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/L_UniversalModels.pro b/src/Libs/L_UniversalModels/L_UniversalModels.pro new file mode 100644 index 000000000..ac4cf1842 --- /dev/null +++ b/src/Libs/L_UniversalModels/L_UniversalModels.pro @@ -0,0 +1,62 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2012-11-30T17:04:40 +# +#------------------------------------------------- + +QT += core sql + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = UniversalModels +TEMPLATE = lib +CONFIG+= build_all +TARGET = $$qtLibraryTarget(UniversalModels) + + +INCLUDEPATH += include \ + ../L_UniversalModels + +QMAKE_CXXFLAGS += -std=gnu++11 + + +DEFINES += L_TREE_CONTROLLER_LIBRARY + +HEADERS += include/TreeModel.h \ + include/TreeItemInterface.h \ + include/l_tree_controller_global.h \ + include/AdaptingTableModel.h \ + include/TreeItem.h \ + include/TableDataInterface.h \ + include/TableDataListHolder.h \ + include/ItemController.h \ + include/treeviewfunctions.h \ + include/treeviewtemplatefunctions.h \ + include/treeitemfunctions.h + +SOURCES += src/TreeModel.cpp \ + src/TreeItemInterface.cpp \ + src/InterfaceAwareTreeData.cpp \ + src/AddressTemplateData.cpp \ + src/AddressTemplateTreeData.cpp \ + src/AdaptingTableModel.cpp \ + src/TableDataInterface.cpp \ + src/AdaptingTableModelPrivate.cpp \ + src/treeviewfunctions.cpp \ + src/treeviewtemplatefunctions.cpp + +Debug{ + MOC_DIR = .../.././build/MOC_debug/UniversalModels + OBJECTS_DIR = ../../../build/Obj_debug/UniversalModels + RCC_DIR = ../../../build/RCC_debug/UniversalModels +} + +Release{ + MOC_DIR = ../../../build/MOC_release/UniversalModels + OBJECTS_DIR = ../../../build/Obj_release/UniversalModels + RCC_DIR = ../../../build/RCC_release/UniversalModels +} + + + UI_DIR = UI + DESTDIR = ../../../bin 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 // + 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 // + decenter_begin 483 + from ref 128170 z 2007 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + from ref 130602 z 2001 stereotype "<>" 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 // + from ref 130602 z 2001 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + from ref 131114 z 2001 stereotype "<>" 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + 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 // + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + + 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 // + 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 // + + 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 // + + 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 clause, origin.queryClauses) + { + queryClauses.push_back(QSharedPointer(clause->clone())); + } + foreach(QSharedPointer item, origin.queryItems) + { + queryItems.push_back(QSharedPointer(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()< clause, queryClauses) + { + Q_ASSERT(clause.data() != 0); + //qDebug()<(queryItems[index].data()); + if(info->GetItemName() == _name) + { + queryItems.remove(index); + return true; + } + } + qDebug()<(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 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: "< + 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 // + from ref 128042 z 2001 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + from ref 137770 z 3012 stereotype "<>" 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 // + 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 // + 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 // + from ref 128810 z 3006 stereotype "<>" 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 // + 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 // + 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 // + from ref 128810 z 3006 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + from ref 137770 z 3012 stereotype "<>" 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 // + 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 // + 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 // + from ref 128810 z 3006 stereotype "<>" 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 // + 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 // + 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 // + from ref 128810 z 3006 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + from ref 128042 z 2001 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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..6fa063e2c --- /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 // + 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 // + 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 // + from ref 130474 z 2024 stereotype "<>" 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 // + 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 // + from ref 132650 z 2012 to ref 128682 + role_a_pos 223 184 3000 no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 133418 relation_ref 814250 // + from ref 133290 z 2001 to ref 132394 + role_a_pos 136 348 3000 no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 133546 relation_ref 814378 // + 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..274f5fc5b --- /dev/null +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -0,0 +1,2721 @@ +format 75 +"TreeController" // TreeController + revision 24 + 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 2 + key "exportHeader" value "#include \"l_tree_controller_global.h\"" + key "export" value "L_TREE_CONTROLLER_EXPORT" + 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 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 >" + 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 "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}${)}${const}${volatile}${abstract}; +" + cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}${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 "column" explicit_type "int" + param in name "value" explicit_type "variant" + param in name "role" explicit_type "int" + 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}${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 >&" + 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 >&" + 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 >" + 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 () + 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 () + 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 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" + 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 >" + 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 + + 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 >" + 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" + 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 () + relation 773034 o--> name "" + a role_name "controller" private + cpp default " ${description}${static}${mutable}${volatile}${const}QSharedPointer<${type} > ${name}${value}; +" + classrelation_ref 773418 // controller () + b parent class_ref 714666 // ItemController + get_oper operation_ref 2114858 // get_controller + set_oper operation_ref 2114986 // set_controller + end + + classrelation 773802 // () + relation 773418 ---|> name "" + a public + cpp default "${type}" + classrelation_ref 773802 // () + 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 "int" + param in name "role" explicit_type "int" + cpp_decl " ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}const ${t0} * ${p0}${v0}, ${t1} ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract}; +" + cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} * ${p0}, ${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 "column" explicit_type "int" + 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}, ${t1} ${p1}${v1}, const ${t2} & ${p2}${v2}, ${t3} ${p3}${v3}${)}${const}${volatile}${abstract}; +" + cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} * ${p0}, ${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" + param inout name "function" explicit_type "std::function" + 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 2168874 "AddSetter" + preserve_cpp_body_indent public explicit_return_type "void" + nparams 2 + + param in name "index" explicit_type "QPair" + param inout name "function" explicit_type "std::function" + 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 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" + class_operation force_body_gen cpp_inline public explicit_return_type "QVector >" + 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 2207914 "set_flagsFunctors" + class_operation force_body_gen public explicit_return_type "void" + nparams 1 + + param in name "value" explicit_type "QVector >" + 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 2208298 "AddFlagsFunctor" + class_operation preserve_cpp_body_indent public explicit_return_type "void" + nparams 1 + + param inout name "functor" explicit_type "std::function" + 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" + class_operation 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, std::function >" + 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, std::function >" + cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + attribute 1294122 "flagsFunctors" + class_attribute private explicit_type "QVector >" + 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 + 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 >" + 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 "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}${)}${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 "column" explicit_type "int" + param in name "value" explicit_type "variant" + param in name "role" explicit_type "int" + cpp_decl " ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${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 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" + 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 >" + 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 + 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" + 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 + + 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 // () + relation 814378 o--> name "" + a role_name "" private + cpp default " +" + java " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; +" + classrelation_ref 814762 // () + 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 () + relation 800426 o--> name "" + 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 () + 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 + + 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" + 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 // () + relation 807466 ---|> name "" + a public + cpp default "${type}" + java "${type}" + classrelation_ref 807850 // () + 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" + 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" + 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&" + 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 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" + param inout name "function" explicit_type "std::function" + 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" + param inout name "function" explicit_type "std::function" + 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 + + attribute 1286314 "m_data" + private explicit_type "QList" + 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, std::function >" + 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, std::function >" + cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end + + classrelation 808106 // controller () + relation 807722 o--> name "" + 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 () + 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 + 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" + 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 >" + 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 >" + 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 () + relation 814250 o--> name "" + 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 () + 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 " + end + + artifact 613034 "ItemController" + 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 714666 // ItemController + end + ncouples 1 + key "header" value "#include " + 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 +#include +#include + +" + 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 "#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 735018 // AdaptingTableModel + end + ncouples 1 + key "header" value "#include +" + end + + artifact 639914 "TableDataInterface" + 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 748330 // TableDataInterface + end + end + + artifact 640042 "TableDataListHolder" + 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 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 +#include +#include +#include +#include +#include +#include " + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + from ref 128682 z 2007 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + from ref 128554 z 2001 stereotype "<>" 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 // + decenter_begin 238 + decenter_end 180 + from ref 128554 z 2007 stereotype "<>" 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 // + from ref 128554 z 2001 stereotype "<>" 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 // + 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 // + 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 // + decenter_begin 67 + from ref 128042 z 2001 stereotype "<>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + from ref 128170 z 2001 stereotype "<>>" 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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 // + 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..527cb3cd2 --- /dev/null +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -0,0 +1,12 @@ +window_sizes 1680 988 394 1281 806 104 +diagrams + active classdiagram_ref 200490 // Adapting Table Model + 1024 644 100 3 0 0 +end +show_stereotypes +selected class_ref 714794 // TreeItem +open + class_ref 714794 // TreeItem + class_ref 714922 // TreeItemInterface +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..605468032 --- /dev/null +++ b/src/Libs/L_UniversalModels/UML/models/cpp_includes @@ -0,0 +1,135 @@ +// "a type" "needed cpp_includes" +"vector" "#include +" + +"list" "#include " + +"map" "#include +using namespace std;" + +"string" "#include +" + +"QStringList" "#include " + +"QString" "#include +#include " + +"QSharedPointer" "#include " + +"QVector" "#include " + +"QLineEdit" "#include " + +"QDateTimeEdit" "#include " + +"QCheckBox" "#include" + +"QObject" "#include " + +"QCheckBox" "#include " + +"QLineEdit" "#include " + +"QDateTimeEdit" "#include " + +"QListView" "#include " + +"QAbstractItemModel" "#include " + +"QColor" "#include " + +"QFont" "#include " + +"QAbstractListModel" "#include " + +"QModelIndex" "#include " + +"QVariant" "#include " + +"QList" "#include " + +"runtime_error" "#include " + +"QLibrary" "#include " + +"QCursor" "#include " + +"QSize" "#include " + +"QImage" "#include " + +"BITMAPINFOHEADER" "#include \"windows.h\"" + +"RECT" "#include \"windows.h\"" + +"QScopedPointer" "#include " + +"Point2" "#include " + +"QPoint" "#include " + +"QMap" "#include " + +"QGraphicsScene" "#include " + +"std::vector" "#include " + +"QRectF" "#include " + +"QPainterPath" "#include " + +"QGraphicsItem" "#include " + +"QPointF" "#include " + +"QGLWidget" "#include " + +"QGraphicsItem" "#include " + +"RenderThread" "#include \"../Threading/renderthread.h\"" + +"QPixmap" "#include " + +"QTimerEvent" "#include " + +"QPainter" "#include " + +"QStyleOptionGraphicsItem" "#include" + +"QWidget" "#include" + +"QPen" "#include " + +"QTransform" "#include " + +"QPolygon" "#include " + +"QGraphicsSceneMouseEvent" "#include " + +"QGraphicsSceneHoverEvent" "#include " + +"QRect" "#include " + +"QFont" "#include " + +"QBrush" "#include " + +"QIcon" "#include " + +"QHash" "#include " + +"Point2" "#include \"MapWrapper/Point2.h\"" + +"QDateTime" "#include " + +"QEvent" "#include " + +"QRegExp" "#include " + +"std::ptr_vector" "#include " + +"QMultiMap" "#include " + +"QSharedPointer" "#include \"MessageBase.h\"" + 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..808b7d6b8 --- /dev/null +++ b/src/Libs/L_UniversalModels/UML/models/generation_settings @@ -0,0 +1,407 @@ + + 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 95 // 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" "sdfdf" "sdsad" "${type}" "${type} &" "${type} &" "${type}" + "itemsharedpointer" "QSharedPointer" "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" "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}" + "point" "Point2" "dsf" "saas" "const ${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}" + "GISLibrary" "GISLibrary" "GISLibrary" "GISLibrary" "${type} *" "${type} &" "${type} *" "${type}" + "scene" "QGraphicsScene" "df" "sdfsdf" "${type}" "${type} &" "${type} &" "${type} *" + "pointf" "Point2" "asdas" "asdasd" "${type}" "${type} &" "${type} &" "const ${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}" + "AniPoint" "AniPoint" "AniPoint" "AniPoint" "const ${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}" + "AniRouteSegment" "AniRouteSegment" "AniRouteSegment" "AniRouteSegment" "const ${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}" + "AbstractAniGraphicsObject" "AbstractAniGraphicsObject" "AbstractAniGraphicsObject" "AbstractAniGraphicsObject" "${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}" + "BasicObjectTreeItem" "BasicObjectTreeItem" "BasicObjectTreeItem" "BasicObjectTreeItem" "${type} *" "${type} &" "${type} &" "${type}" + "AbstractTreeItem" "AbstractTreeItem" "AbstractTreeItem" "AbstractTreeItem" "${type} *" "${type} &" "${type} &" "${type}" + "AbstractAniGraphicsIndividualObjectSettings" "AbstractAniGraphicsIndividualObjectSettings" "AbstractAniGraphicsIndividualObjectSettings" "AbstractAniGraphicsIndividualObjectSettings" "${type} *" "${type} &" "${type} &" "${type} *" + "AbstractFormInteractionInterface" "AbstractFormInteractionInterface" "AbstractFormInteractionInterface" "AbstractFormInteractionInterface" "${type} *" "${type} &" "${type} &" "${type} *" + "AniGraphicsAreaSettings" "AniGraphicsAreaSettings" "AniGraphicsAreaSettings" "AniGraphicsAreaSettings" "${type}" "${type} &" "${type} &" "${type} *" + "AbstractAniGraphicsAreaSettings" "AbstractAniGraphicsAreaSettings" "AbstractAniGraphicsAreaSettings" "AbstractAniGraphicsAreaSettings" "${type}" "${type} &" "${type} &" "${type} *" + "AbstractAniGraphicsPointSettings" "AbstractAniGraphicsPointSettings" "AbstractAniGraphicsPointSettings" "AbstractAniGraphicsPointSettings" "${type}" "${type} &" "${type} &" "${type} *" + "hash" "QHash" "QHash" "QHash" "${type}" "${type} &" "${type} &" "${type}" + "AniGraphicsSettingsHash" "AniGraphicsSettingsHash" "AniGraphicsSettingsHash" "AniGraphicsSettingsHash" "${type} *" "${type} &" "${type} &" "${type} *" + "AniLineSegment" "AniLineSegment" "AniLineSegment" "AniLineSegment" "${type}" "${type} &" "${type} &" "const ${type} &" + "AniAbstractPainterInterface" "AniAbstractPainterInterface" "AniAbstractPainterInterface" "AniAbstractPainterInterface" "${type} *" "${type} &" "${type} &" "${type}" + "AniGeneralPointType" "AniGeneralPointType" "AniGeneralPointType" "AniGeneralPointType" "const ${type} &" "${type} &" "${type} &" "const ${type} &" + "AniObjectPaintingData" "AniObjectPaintingData" "AniObjectPaintingData" "AniObjectPaintingData" "${type}" "${type} &" "${type} &" "const ${type} &" + "datetime" "QDateTime" "QDateTime" "QDateTime" "${type}" "${type} &" "${type} &" "${type}" + "event" "QEvent" "QEvent" "QEvent" "${type} *" "${type} &" "${type} &" "${type}" + "SeparationResult" "SeparationResult" "SeparationResult" "SeparationResult" "${type}" "${type} &" "${type} &" "${type}" + "ptr_vector_t" "boost::ptr_vector" "std::ptr_vector" "std::ptr_vector" "${type}" "${type} &" "${type} &" "${type}" + "ref_ptr_vector_t" "boost::ptr_vector" "boost::ptr_vector" "boost::ptr_vector" "${type}" "${type} &" "${type} &" "${type}" + "Field" "Field" "Field" "Field" "${type} *" "${type} *" "${type} *" "${type}" + "shared_pointer_vector_t" "QVector >" "QVector >" "QVector >" "${type}" "${type} &" "${type} &" "${type}" + "ref_shared_pointer_vector_t" "QVector >&" "QVector >&" "QVector >&" "${type}" "${type} &" "${type} &" "${type}" + "QSharedPointer" "QSharedPointer" "QSharedPointer" "QSharedPointer" "${type}" "${type} &" "${type} &" "${type}" + "QVector >" "QVector >" "QVector >" "QVector >" "${type}" "${type} &" "${type} &" "${type}" + "QSharedPointer" "QSharedPointer" "QSharedPointer" "QSharedPointer" "${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_force_throw + 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_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..7cb108e32 --- /dev/null +++ b/src/Libs/L_UniversalModels/UML/models/models.prj @@ -0,0 +1,59 @@ +format 75 +"models" + revision 125 + 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..0021cb2bf --- /dev/null +++ b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h @@ -0,0 +1,79 @@ +// ************************************************************************* +// +// 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 +#include +#include +#include + +#include "l_tree_controller_global.h" + +#include + +class TableDataInterface; +class AdaptingTableModelPrivate; + + +class L_TREE_CONTROLLER_EXPORT AdaptingTableModel : public QAbstractTableModel +{ + +Q_OBJECT + + public: + AdaptingTableModel(QObject * parent = 0); + + virtual ~AdaptingTableModel(); + + QVariant data(const QModelIndex & index, int role) const; + + bool setData(const QModelIndex & index, const QVariant & value, int role); + + int rowCount(const QModelIndex & index) const; + + int columnCount(const QModelIndex & index) const; + + void SetInterface(QSharedPointer _interface); + + QModelIndex index(int row, int column, const QModelIndex & parent) const; + + Qt::ItemFlags flags(const QModelIndex & index) const; + + QVariant headerData(int section, Qt::Orientation orientation, int role) const; + + +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 + +#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 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..41cfba306 --- /dev/null +++ b/src/Libs/L_UniversalModels/include/ItemController.h @@ -0,0 +1,175 @@ +// ************************************************************************* +// +// 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 +#include +#include +#include +#include + +#include "l_tree_controller_global.h" + +#include + +template +class ItemController +{ + public: + inline QStringList GetColumns() const; + + void SetColumns(QStringList value); + + QVariant GetValue(const T * item, int index, int role); + + bool SetValue(T * item, int column, const QVariant & value, int role); + + void AddGetter(const QPair & index, std::function function); + + void AddSetter(const QPair & index, std::function function); + + Qt::ItemFlags flags(const QModelIndex & index) const; + + static inline QVector > GetFlagsFunctors(); + + static void SetFlagsFunctors(QVector > value); + + static void AddFlagsFunctor(std::function functor); + + static void SetDefaultTreeFunctor(); + + + private: + QStringList columns; + QHash, std::function > getters; + QHash, std::function > setters; + static QVector > flagsFunctors; +}; +template +inline QStringList ItemController::GetColumns() const +{ + return columns; +} + +template +void ItemController::SetColumns(QStringList value) +{ + columns = value; +} + +template +QVariant ItemController::GetValue(const T * item, int index, int role) +{ + // Bouml preserved body begin 00203B2A + //return QVariant(); + if(!getters.contains(QPair(index, role))) + return QVariant(); + QVariant ret = getters[QPair(index, role)](item); + return ret; + // Bouml preserved body end 00203B2A +} + +template +bool ItemController::SetValue(T * item, int column, const QVariant & value, int role) +{ + // Bouml preserved body begin 00203BAA + if(!setters.contains(QPair(column, role))) + return false; + return setters[QPair(column, role)](item, value); + // Bouml preserved body end 00203BAA +} + +template +void ItemController::AddGetter(const QPair & index, std::function function) +{ + // Bouml preserved body begin 002117AA + getters.insert(index, function); + // Bouml preserved body end 002117AA +} + +template +void ItemController::AddSetter(const QPair & index, std::function function) +{ + // Bouml preserved body begin 0021182A + setters.insert(index, function); + // Bouml preserved body end 0021182A +} + +template +Qt::ItemFlags ItemController::flags(const QModelIndex & index) const +{ + // Bouml preserved body begin 0021AFAA + Qt::ItemFlags result; + for(auto func: flagsFunctors) + { + result |= func(index); + } + return result; + // Bouml preserved body end 0021AFAA +} + +template +inline QVector > ItemController::GetFlagsFunctors() + +{ + return flagsFunctors; +} + +template +void ItemController::SetFlagsFunctors(QVector > value) + +{ + flagsFunctors = value; +} + +template +void ItemController::AddFlagsFunctor(std::function functor) + +{ + // Bouml preserved body begin 0021B22A + flagsFunctors.append(functor); + // Bouml preserved body end 0021B22A +} + +template +void ItemController::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 +} + +template +QVector > ItemController::flagsFunctors; +#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..e78329875 --- /dev/null +++ b/src/Libs/L_UniversalModels/include/TableDataInterface.h @@ -0,0 +1,63 @@ +// ************************************************************************* +// +// 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 +#include +#include + +#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; + + +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..230398b10 --- /dev/null +++ b/src/Libs/L_UniversalModels/include/TableDataListHolder.h @@ -0,0 +1,181 @@ +// ************************************************************************* +// +// 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 +#include +#include +#include +#include +#include "ItemController.h" + +#include "l_tree_controller_global.h" + + + +template +class TableDataListHolder : public TableDataInterface +{ + public: + virtual QVariant GetValue(int row, int column, int role) const; + + virtual void SetValue(int row, int column, int role, const QVariant & value); + + virtual QStringList GetColumns(); + + void SetColumns(QStringList _columns); + + void SetData(const QList & data); + + QList GetData() const; + + QList& GetData(); + + virtual int columnCount() const; + + virtual int rowCount() const; + + void AddGetter(const QPair & index, std::function function); + + void AddSetter(const QPair & index, std::function function); + + virtual int PreviousRowCount(); + + + private: + QList m_data; + QHash, std::function > setters; + QHash, std::function > getters; + QSharedPointer > controller; + + QStringList m_columns; + int previousRowCount; +}; +template +QVariant TableDataListHolder::GetValue(int row, int column, int role) const +{ + // Bouml preserved body begin 0021352A + if(!getters.contains(QPair(column, role))) + return QVariant(); + QVariant ret = getters[QPair(column, role)](&m_data.at(row)); + return ret; + // Bouml preserved body end 0021352A +} + +template +void TableDataListHolder::SetValue(int row, int column, int role, const QVariant & value) +{ + // Bouml preserved body begin 002135AA + if(setters.contains(QPair(column, role))) + return; + setters[QPair(column, role)](&m_data[row], value); + // Bouml preserved body end 002135AA +} + +template +QStringList TableDataListHolder::GetColumns() +{ + // Bouml preserved body begin 0021362A + return m_columns; + // Bouml preserved body end 0021362A +} + +template +void TableDataListHolder::SetColumns(QStringList _columns) +{ + // Bouml preserved body begin 00213C2A + m_columns = _columns; + // Bouml preserved body end 00213C2A +} + +template +void TableDataListHolder::SetData(const QList & data) +{ + // Bouml preserved body begin 002136AA + previousRowCount = m_data.size(); + m_data = data; + emit reloadData(); + // Bouml preserved body end 002136AA +} + +template +QList TableDataListHolder::GetData() const +{ + // Bouml preserved body begin 00218C2A + return m_data; + // Bouml preserved body end 00218C2A +} + +template +QList& TableDataListHolder::GetData() +{ + // Bouml preserved body begin 0021E7AA + return m_data; + // Bouml preserved body end 0021E7AA +} + +template +int TableDataListHolder::columnCount() const +{ + // Bouml preserved body begin 002138AA + return m_columns.size(); + // Bouml preserved body end 002138AA +} + +template +int TableDataListHolder::rowCount() const +{ + // Bouml preserved body begin 002137AA + return m_data.size(); + // Bouml preserved body end 002137AA +} + +template +void TableDataListHolder::AddGetter(const QPair & index, std::function function) +{ + // Bouml preserved body begin 00213A2A + getters.insert(index, function); + // Bouml preserved body end 00213A2A +} + +template +void TableDataListHolder::AddSetter(const QPair & index, std::function function) +{ + // Bouml preserved body begin 00213AAA + setters.insert(index, function); + // Bouml preserved body end 00213AAA +} + +template +int TableDataListHolder::PreviousRowCount() +{ + // Bouml preserved body begin 0022372A + return previousRowCount; + // Bouml preserved body end 0022372A +} + +#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..22a9cdead --- /dev/null +++ b/src/Libs/L_UniversalModels/include/TreeItem.h @@ -0,0 +1,391 @@ +// ************************************************************************* +// +// 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 _TREEITEM_H +#define _TREEITEM_H + + +#include +#include +#include "TreeItemInterface.h" +#include +#include "ItemController.h" +#include +#include + +#include "l_tree_controller_global.h" + +#include + +template +class TreeItem : public TreeItemInterface +{ +typedef TreeItem value_type; + public: + TreeItem(T * data = nullptr); + + explicit TreeItem(); + + virtual QList > GetChildren(); + + void ResetState(); + + virtual ~TreeItem(); + + virtual int columnCount() const; + + virtual int childCount() const; + + virtual QVariant data(int column, int role); + + virtual bool isCheckable() const; + + virtual void setCheckState(Qt::CheckState state); + + virtual Qt::CheckState checkState(); + + virtual bool setData(int column, const QVariant & value, int role); + + virtual bool removeChildren(int position, int count); + + virtual bool insertChildren(int position, int count); + + virtual QList >& children(); + + virtual const QList >& children() const; + + void addChildren(QList > _children); + + inline QSharedPointer > GetController() const; + + void SetController(QSharedPointer > value); + + virtual QStringList GetColumns(); + + virtual int IndexOf(TreeItemInterface * item); + + void SetInternalData(T * _data); + + void* InternalPointer(); + + virtual TreeItemInterface* child(int row); + + virtual TreeItemInterface* parent(); + + virtual int row(); + + virtual void SetParent(QSharedPointer _parent); + + int GetIndexOfChild(TreeItemInterface * child); + + virtual Qt::ItemFlags flags(const QModelIndex & index) const; + + virtual void AddChildren(QList > children, int insertAfter = 0); + + + private: + T* m_data = nullptr; + + protected: + QList > m_children; + QWeakPointer m_parent; + + private: + bool m_isCheckable; + Qt::CheckState m_checkState; + QSharedPointer > controller; + +}; +template +TreeItem::TreeItem(T * data) : TreeItemInterface() +{ + // Bouml preserved body begin 0020A62A + ResetState(); + m_data = data; + // Bouml preserved body end 0020A62A +} + +template +TreeItem::TreeItem() : TreeItemInterface() +{ + // Bouml preserved body begin 0020A72A + ResetState(); + // Bouml preserved body end 0020A72A +} + +template +QList > TreeItem::GetChildren() +{ + // Bouml preserved body begin 002202AA + return m_children; + // Bouml preserved body end 002202AA +} + +template +void TreeItem::ResetState() +{ + // Bouml preserved body begin 0021CE2A + m_checkState = Qt::Unchecked; + //m_data = T(); + m_children.clear(); + m_parent.clear(); + m_isCheckable = false; + controller = QSharedPointer >(); + // Bouml preserved body end 0021CE2A +} + +template +TreeItem::~TreeItem() +{ + // Bouml preserved body begin 0020A6AA + // Bouml preserved body end 0020A6AA +} + +template +int TreeItem::columnCount() const +{ + // Bouml preserved body begin 0020402A + return controller->GetColumns().size(); + // Bouml preserved body end 0020402A +} + +template +int TreeItem::childCount() const +{ + // Bouml preserved body begin 002040AA + return m_children.size(); + // Bouml preserved body end 002040AA +} + +template +QVariant TreeItem::data(int column, int role) +{ + // Bouml preserved body begin 00203FAA + return controller->GetValue(m_data, column, role); + // Bouml preserved body end 00203FAA +} + +template +bool TreeItem::isCheckable() const +{ + // Bouml preserved body begin 00203F2A + return m_isCheckable; + // Bouml preserved body end 00203F2A +} + +template +void TreeItem::setCheckState(Qt::CheckState state) +{ + // Bouml preserved body begin 00203EAA + m_checkState = state; + // Bouml preserved body end 00203EAA +} + +template +Qt::CheckState TreeItem::checkState() +{ + // Bouml preserved body begin 00203E2A + return m_checkState; + // Bouml preserved body end 00203E2A +} + +template +bool TreeItem::setData(int column, const QVariant & value, int role) +{ + // Bouml preserved body begin 00203D2A + controller->SetValue(m_data, column,value, role); + return true; + // Bouml preserved body end 00203D2A +} + +template +bool TreeItem::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 +bool TreeItem::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 item (new TreeItem(0)); + m_children.insert(position, item); + } + + return true; + // Bouml preserved body end 00203C2A +} + +template +QList >& TreeItem::children() +{ + // Bouml preserved body begin 0020432A + return m_children; + // Bouml preserved body end 0020432A +} + +template +const QList >& TreeItem::children() const +{ + // Bouml preserved body begin 002042AA + return m_children; + // Bouml preserved body end 002042AA +} + +template +void TreeItem::addChildren(QList > _children) +{ + // Bouml preserved body begin 0020422A + m_children.append(_children); + // Bouml preserved body end 0020422A +} + +template +inline QSharedPointer > TreeItem::GetController() const +{ + return controller; +} + +template +void TreeItem::SetController(QSharedPointer > value) +{ + controller = value; +} + +template +QStringList TreeItem::GetColumns() +{ + // Bouml preserved body begin 00206CAA + return controller->GetColumns(); + // Bouml preserved body end 00206CAA +} + +template +int TreeItem::IndexOf(TreeItemInterface * item) +{ + // Bouml preserved body begin 00206D2A + return GetIndexOfChild(item); + // Bouml preserved body end 00206D2A +} + +template +void TreeItem::SetInternalData(T * _data) +{ + // Bouml preserved body begin 0020A7AA + m_data = _data; + // Bouml preserved body end 0020A7AA +} + +template +void* TreeItem::InternalPointer() +{ + // Bouml preserved body begin 002086AA + return m_data; + // Bouml preserved body end 002086AA +} + +template +TreeItemInterface* TreeItem::child(int row) +{ + // Bouml preserved body begin 0020CD2A + return m_children.at(row).data(); + // Bouml preserved body end 0020CD2A +} + +template +TreeItemInterface* TreeItem::parent() +{ + // Bouml preserved body begin 0020CDAA + return m_parent.toStrongRef().data(); + // Bouml preserved body end 0020CDAA +} + +template +int TreeItem::row() +{ + // Bouml preserved body begin 0020CEAA + if (!m_parent.isNull()) + return dynamic_cast*>(m_parent.toStrongRef().data())->IndexOf(this); + return 0; + // Bouml preserved body end 0020CEAA +} + +template +void TreeItem::SetParent(QSharedPointer _parent) +{ + // Bouml preserved body begin 0020CFAA + m_parent = _parent; + // Bouml preserved body end 0020CFAA +} + +template +int TreeItem::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 +Qt::ItemFlags TreeItem::flags(const QModelIndex & index) const +{ + // Bouml preserved body begin 0021B2AA + return controller->flags(index); + // Bouml preserved body end 0021B2AA +} + +template +void TreeItem::AddChildren(QList > 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(auto child : children) + { + m_children.insert(m_children.begin() + insertAfter + i, child); + i++; + } + // Bouml preserved body end 002201AA +} + + +#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..10efa061e --- /dev/null +++ b/src/Libs/L_UniversalModels/include/TreeItemInterface.h @@ -0,0 +1,91 @@ +// ************************************************************************* +// +// 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 _TREEITEMINTERFACE_H +#define _TREEITEMINTERFACE_H + + +#include +#include +#include +#include +#include + +#include "l_tree_controller_global.h" + +#include +#include +#include + + + +class L_TREE_CONTROLLER_EXPORT TreeItemInterface +{ + public: + explicit TreeItemInterface(); + + virtual ~TreeItemInterface(); + + virtual QList > GetChildren() = 0; + + virtual int childCount() const = 0; + + virtual int columnCount() const = 0; + + virtual QVariant data(int column, int role) = 0; + + virtual bool isCheckable() const = 0; + + virtual void setCheckState(Qt::CheckState state) = 0; + + virtual Qt::CheckState checkState() = 0; + + virtual bool setData(int column, 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 TreeItemInterface* child(int row) = 0; + + virtual TreeItemInterface* parent() = 0; + + virtual int row() = 0; + + virtual void SetParent(QSharedPointer _parent) = 0; + + virtual Qt::ItemFlags flags(const QModelIndex & index) const = 0; + + virtual void AddChildren(QList > children, int insertAfter = 0) = 0; + + virtual int IndexOf(TreeItemInterface * item) = 0; + + virtual int GetIndexOfChild(TreeItemInterface * child) = 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..634b92fba --- /dev/null +++ b/src/Libs/L_UniversalModels/include/TreeModel.h @@ -0,0 +1,81 @@ +// ************************************************************************* +// +// 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 +#include +#include +#include +#include +#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(); + + QVariant data(const QModelIndex & index, int role) const; + + bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ); + + Qt::ItemFlags flags(const QModelIndex & index) const; + + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + + QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const; + + QModelIndex parent(const QModelIndex & index) const; + + int rowCount(const QModelIndex & parent = QModelIndex()) const; + + int columnCount(const QModelIndex & parent = QModelIndex()) const; + + TreeItemInterface * RootItem(); + + void InsertRootItem(QSharedPointer); + + TreeItemInterface * getItem(const QModelIndex & index) const; + + bool insertRows(int position, int rows, const QModelIndex & parent); + + bool removeRows(int position, int rows, const QModelIndex & parent); + + void reset(); + + QSharedPointer rootItem; + +signals: + void dataEditFinished(const QModelIndex &); + +}; + + +#endif 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..e48641ac2 --- /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 +#include + +#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..f1c793cda --- /dev/null +++ b/src/Libs/L_UniversalModels/include/treeitemfunctions.h @@ -0,0 +1,172 @@ +// ************************************************************************* +// +// 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 +using RootChecks = QList >; +template +using ModifierFunction = std::function; +template +using ModifierFunctions = QList >; + + +/* Отфильтровывает из дерева ноды которые удовлетворяют условиям проверок + * @rootItem верхний уровень дерева от которого производится фильтрация + * @filterFunctions список проверок которым должна удовлетворять нода + * @forcePick говорит о том, что ноду нужно зацепить в любом случае(когда нода-папка удовлетворяет условию) + **/ +template +QSharedPointer RecursiveGetSubset(InterfaceType* rootItem, RootChecks filterFunctions, bool forcePick = false) +{ + QList> newChildren; + bool nodeValid = true; + for(std::function filter: filterFunctions) + { + if(!filter(rootItem)) + { + nodeValid = false; + break; + } + } + if(!rootItem->GetChildren().isEmpty()) + { + for(QSharedPointer child: rootItem->GetChildren()) + { + QSharedPointer newChild = RecursiveGetSubset(child.data(), filterFunctions, nodeValid); + if(!newChild.isNull()) + newChildren += newChild; + } + } + QSharedPointer newItem; + bool hasValidDescendants = !newChildren.isEmpty(); + if(nodeValid || hasValidDescendants || forcePick) + { + newItem = QSharedPointer(new ConcreteItemType(*dynamic_cast(rootItem))); + newItem->removeChildren(0, newItem->childCount()); + for(QSharedPointer child: newChildren) + { + child->SetParent(newItem); + } + newItem->AddChildren(newChildren); + } + return newItem; +} + +template +void ModifyNode(InterfaceType* node, ModifierFunctions modifierFunctions) +{ + if(!node) + return; + for(ModifierFunction func : modifierFunctions) + { + func(node); + } + +} + +template +bool RecursiveModify(InterfaceType* rootItem, RootChecks filterFunctions, ModifierFunctions modifierFunctions, + bool parentsFirst = true, bool stopAtFirstMatch = true ) +{ + bool result = false; + bool nodeValid = true; + for(std::function filter: filterFunctions) + { + if(!filter(rootItem)) + { + nodeValid = false; + break; + } + } + if(nodeValid && parentsFirst) + { + result = true; + ModifyNode(rootItem,modifierFunctions); + if(stopAtFirstMatch) + return result; + } + + if(!rootItem->GetChildren().isEmpty()) + { + for(QSharedPointer child: rootItem->GetChildren()) + { + result = RecursiveModify(child.data(), filterFunctions, modifierFunctions, parentsFirst, stopAtFirstMatch); + if(stopAtFirstMatch) + return result; + } + } + if(nodeValid && !parentsFirst) + { + result = true; + ModifyNode(rootItem,modifierFunctions); + if(stopAtFirstMatch) + return result; + } + return result; +} + + + + +/* Отфильтровывает из дерева список свойств по переданному аксессору + * @rootItem верхний уровень дерева от которого производится фильтрация + * @accessor функция для доступа к конкретному члену структуры который надо выцепить + **/ +template +QList RecursiveGet(T* rootItem, std::function accessor) +{ + QList result; + if(!rootItem->GetChildren().isEmpty()) + { + for(QSharedPointer child: rootItem->GetChildren()) + { + result += RecursiveGet(child.data(), accessor); + } + } + result.append(accessor(rootItem)); + return result; + +} +/* Отфильтровывает из дерева ноды которые удовлетворяют условиям проверок + * и помещает их в интерфейс для последующего запихивания в дерево + * + * @rootItem верхний уровень дерева от которого производится фильтрация + * @filterFunctions список проверок которым должна удовлетворять нода + **/ +template class ItemType, typename DataType> +QSharedPointer FilterSubset(QSharedPointer rootItem, QList > filterFunctions) +{ + QSharedPointer item; + ItemType* newRoot = new ItemType(0); + item = QSharedPointer(newRoot); + + item = TreeFunctions::RecursiveGetSubset>(rootItem.data(), filterFunctions); + return item; +} + +}; +#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..21cce8872 --- /dev/null +++ b/src/Libs/L_UniversalModels/include/treeviewfunctions.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 TREEFUNCTIONS_H +#define TREEFUNCTIONS_H +#include +#include +#include +#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()); +} +#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..6fa02ca4e --- /dev/null +++ b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h @@ -0,0 +1,314 @@ +// ************************************************************************* +// +// 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 +#include +#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 class ItemType, template class ControllerType> +QSharedPointer CreateInterfaceFromData(QSharedPointer parentItem, DataType& data, + QSharedPointer > controller) +{ + ItemType* pointer = new ItemType(); + QSharedPointer newItem(pointer); + pointer->SetInternalData(data); + pointer->SetController(controller); + pointer->SetParent(parentItem); + + data.SetInterfacePointer(newItem.data()); + return newItem; +} +/* Возвращет из отображения указатель на текущий интерфейс + * @view указатель на отображение из которого извлекается интерфейс + **/ +template +InterfaceType* GetCurrentInterface(QAbstractItemView* view) +{ + auto currentIndex = view->selectionModel()->currentIndex(); + if(!currentIndex.isValid()) + return nullptr; + auto pointer = static_cast(currentIndex.internalPointer()); + return pointer; +} +/* Возвращет из отображения указатель на текущие данные + * @view указатель на отображение из которого извлекаются данные + **/ +template class TreeItemType, typename DataType, typename InterfaceType> +DataType* GetCurrentDataPointer(QAbstractItemView* view) +{ + TreeItemType *pointer = dynamic_cast* >(GetCurrentInterface(view)); + DataType* data = static_cast(pointer->InternalPointer()); + return data; +} + + + +/* Возвращает родителя для создаваемого потомка на основании режима вставки + * @insertionMode Информация о том как именно вставляется потомок. Нодой или папкой + * @current указатель на интерфейс являющийся текущим в модели + * @root указатель на корневую ноду (для сличения с корнем дерева) + **/ +template class TreeItemType, typename DataType, typename InterfaceType> +QSharedPointer GetParent(ENodeInsertionMode insertionMode, InterfaceType* current, QSharedPointer root) +{ + InterfaceType* parent = current->parent(); + bool parentIsRoot = parent == root.data(); + QSharedPointer sharedOfParent; + if(insertionMode == ENodeInsertionMode::sibling) + { + if(parentIsRoot) + sharedOfParent = root; + else + { + TreeItemType* parentOfParent = dynamic_cast*>(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 class TreeItemType, typename DataType, typename InterfaceType> +TreeItemType* AddItem(std::function dataGenerator, QAbstractItemView* view, + QSharedPointer root, ENodeInsertionMode insertionMode, bool addBelow = true) +{ + QSharedPointer parent = GetParent + (insertionMode, GetCurrentInterface(view), root); + + bool parentIsRoot = parent.data() == root.data(); + + TreeItemType* parentItem = dynamic_cast*>(parent.data()); + DataType* parentData = static_cast(parentItem->InternalPointer()); + + + DataType data = dataGenerator(parentIsRoot ? nullptr : parentData); + + + TreeItemType* newTemplateItem = new TreeItemType(); + QSharedPointer newItem(newTemplateItem); + newTemplateItem->SetInternalData(data); + newTemplateItem->SetController(dynamic_cast*>(parent.data())->GetController()); + newTemplateItem->SetParent(parent); + + data.SetInterfacePointer(newItem.data()); + + int indexToInsert = GetChildInsertionIndex(view, insertionMode, addBelow); + parent->AddChildren(QList >() << newItem, indexToInsert); + TreeModel* model = dynamic_cast(view->model()); + model->InsertRootItem(root); + return dynamic_cast*>(newItem.data()); +} + + +/* Производит фильтрацию в дереве и устанавливает результат в качестве корневой ноды + * @dataGenerator генератор для создания данных для помещения в интерфейс + * @treeView указатель на дерево-отображение + * @rootItem указатель на корневую ноду (для сличения с корнем дерева) + * @createCheckListFunc фуннкция создающая необходимые для фильтрации проверки + * @expandedNodes ссылка на хранилице открытых нод дерева + * @isFilteredTree ссылка на хранилище состояние фильтрованности дерева + **/ + +template class ItemType, typename DataType> +bool PerformFiltering(TreeModel* treeModel, + QSharedPointer rootItem, + std::function > ()> createCheckListFunc) +{ + QSharedPointer item; + QList > checkList = createCheckListFunc(); + if(checkList.isEmpty()) + item = rootItem; + else + item = TreeFunctions::FilterSubset(rootItem, checkList); + treeModel->InsertRootItem(item); + if(item == rootItem) + return false; + return true; +} + +template class ItemType, typename DataType> +static inline QString GetPathFromIndex(std::function dataAccessor, const QModelIndex& startIndex) +{ + auto pointer = static_cast(startIndex.internalPointer()); + ItemType *dataPointer = nullptr; + QString path; + if(pointer) + { + dataPointer = dynamic_cast* >(pointer); + DataType* data = static_cast(dataPointer->InternalPointer()); + QString newPath = dataAccessor(data).toString() + QObject::tr(","); + path+=newPath; + } + else + { + path+=QObject::tr("-11111,"); + } + return path; +} + +template class ItemType, typename DataType> +static inline QString GetFullPathFromIndex(std::function dataAccessor, QModelIndex startIndex) +{ + QString result; + if(!startIndex.isValid()) + return QString(); + if(startIndex.parent().isValid()) + result.append(GetFullPathFromIndex(dataAccessor, startIndex.parent())); + return result + GetPathFromIndex(dataAccessor, startIndex); +} + + +/* Рекурсивно восстанавливает состояние нод дерева + * @nodes список открытых нод. Заполняется как послеовательная строка строка-колонка... + * @view отображение в котором требуется восстановить состояние + * @model указатель на модель + * @startIndex индекс для детей которого восстанавливается состояние + * @path текущий путь вверх по дереву + **/ +//template class TreeItemType, typename DataType, typename InterfaceType> +//DataType* GetCurrentDataPointer(QAbstractItemView* view) + +template class ItemType, typename DataType> +void ApplyNodePathExpandState(std::function dataAccessor, + QStringList & nodes, + QTreeView * view, + QAbstractItemModel * model, + const QModelIndex startIndex, + QString path = QString()) +{ + path+=GetPathFromIndex(dataAccessor, startIndex); + for(int i(0); i < model->rowCount(startIndex); ++i) + { + QModelIndex child = model->index(i, 0, startIndex); + QString nextPath = path + GetPathFromIndex(dataAccessor,child); + if(!nodes.contains(nextPath)) + continue; + ApplyNodePathExpandState + (dataAccessor, nodes, view, model, child, path); + } + if(nodes.contains(path)) + view->setExpanded( startIndex.sibling(startIndex.row(), 0), true ); +} +/* Рекурсивно сохраняет состояние нод дерева + * @nodes список открытых нод. Заполняется как последовательная строка строка-колонка... + * @view отображение в котором требуется сохранить состояние + * @model указатель на модель + * @startIndex индекс для детей которого сохраняется состояние + * @path текущий путь вверх по дереву + **/ +template class ItemType, typename DataType> +void StoreNodePathExpandState(std::function dataAccessor, + QStringList & nodes, + QTreeView * view, + QAbstractItemModel * model, + const QModelIndex startIndex, + QString path = QString()) +{ + // Bouml preserved body begin 002020AA + path+=GetPathFromIndex(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(dataAccessor,child); + nodes.removeAll(nextPath); + continue; + } + StoreNodePathExpandState + (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 class ItemType, typename DataType> +void FilterTreeAndRestoreNodes(std::function dataAccessor, + std::function > ()> createCheckListFunc, + QStringList & nodes, + QTreeView * view, + TreeModel * model, + QSharedPointer startIndex) +{ + TreeFunctions::StoreNodePathExpandState(dataAccessor, nodes, view, model, QModelIndex()); + PerformFiltering(model,startIndex,createCheckListFunc); + TreeFunctions::ApplyNodePathExpandState(dataAccessor, nodes, view, model, QModelIndex()); +} +} +#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..045d5aec3 --- /dev/null +++ b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp @@ -0,0 +1,152 @@ +// ************************************************************************* +// +// 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 _interface) +{ + // Bouml preserved body begin 00218B2A + Q_D(AdaptingTableModel); + d->interface = _interface; + TableDataInterface* interfacePointer = d->interface.data(); + 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 + if (!hasIndex(row, column, parent)) + return QModelIndex(); + return createIndex(row, column); + // Bouml preserved body end 00213CAA +} + +Qt::ItemFlags AdaptingTableModel::flags(const QModelIndex & index) const +{ + // Bouml preserved body begin 002170AA + if (!index.isValid()) + return 0; + + Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable; + + if ( index.column() == 0 ) + flags |= Qt::ItemIsUserCheckable; + + return flags; + // 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 (orientation == Qt::Horizontal && role == Qt::DisplayRole) + { + //qDebug() << interface->GetColumns().at(section); + return d->interface->GetColumns().at(section); + } + return QVariant(); + // Bouml preserved body end 0021712A +} + +void AdaptingTableModel::OnReloadDataFromInterface() +{ + // Bouml preserved body begin 0021702A + Q_D(AdaptingTableModel); + reset(); + + if(d->interface->PreviousRowCount() == 0) + { + int removeLimit = d->interface->PreviousRowCount() == 0 ? 0 : d->interface->PreviousRowCount()- 1; + 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..c84fa8b03 --- /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..026a4d190 --- /dev/null +++ b/src/Libs/L_UniversalModels/src/TableDataInterface.cpp @@ -0,0 +1,39 @@ +// ************************************************************************* +// +// 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/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..23dd38e0d --- /dev/null +++ b/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp @@ -0,0 +1,39 @@ +// ************************************************************************* +// +// 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/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..94476187e --- /dev/null +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -0,0 +1,288 @@ +// ************************************************************************* +// +// 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 +#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(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) + return item->data(index.column(),role); + + if(role == Qt::DecorationRole ) + return item->data(index.column(),role); + if(role == Qt::ForegroundRole) + { + if(index.sibling(index.row(), 14).data().toBool() == true) + return QColor(Qt::lightGray); + if(index.sibling(index.row(), 15).data().toBool() == true) + return QColor(Qt::darkGreen); + } + 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(index.internalPointer()); + item->setCheckState(static_cast(value.toInt())); + emit dataChanged(index,index); + return true; + } + + if(role==Qt::EditRole) + { + TreeItemInterface* item = dynamic_cast(getItem(index)); + bool result = item->setData(index.column(), 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; + Qt::ItemFlags flags = rootItem->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(parent.internalPointer()); + + TreeItemInterface *childItem = static_cast(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(index.internalPointer()); + TreeItemInterface *parentItem = dynamic_cast(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(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(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::InsertRootItem(QSharedPointer item) +{ + reset(); + if(!rootItem.isNull()) + { + 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(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; + + 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(); +} + + diff --git a/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp b/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp new file mode 100644 index 000000000..4775f784e --- /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 +#include +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..1ae59bc8f --- /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/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 +using namespace std;" + +"list" "#include +using namespace std;" + +"map" "#include +using namespace std;" + +"string" "#include +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_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/BrowserClass.h b/src/browser/BrowserClass.h index c45d79b70..e27421870 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -55,6 +55,7 @@ class BrowserClass : public BrowserNode, public Labeled friend class StereotypesDialog; protected: + BrowserClass(int id); static IdDict all; static QStringList its_default_stereotypes; @@ -66,7 +67,7 @@ class BrowserClass : public BrowserNode, public Labeled Q3ValueList associated_components; // realize or provide it protected: - BrowserClass(int id); + void exec_menu_choice(int index, Q3PtrList & l); public: diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index 0d7db3f02..9760c6a0e 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -190,6 +190,7 @@ class BrowserNode : public Q3ListViewItem, virtual void menu() = 0; virtual void apply_shortcut(QString s) = 0; /* Open a Diagram Window */ + virtual const QPixmap * pixmap(int) const{return 0;} virtual void open(bool force_edit); virtual void on_close(); virtual UmlCode get_type() const = 0; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 94e580c30..3446ab4bc 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -43,6 +43,7 @@ #include #ifndef QT_NO_PRINTER #include +#include #endif #include #include @@ -50,6 +51,7 @@ #include #include #include +#include //#include [lgfreitas] this does not exists anymore //Added by qt3to4: #include @@ -105,6 +107,17 @@ #include "misc/ClipboardManager.h" #include #include +#include + +// 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 "ProfiledStereotypes.h" +#include "ClassData.h" +#include static QString TemplateProject; @@ -475,8 +488,35 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) spl1 = new QSplitter(Qt::Horizontal, this, "spl1"); spl2 = new QSplitter(Qt::Vertical, spl1, "spl2"); - browser = new BrowserView(spl1); + twTreeHolder = new QTabWidget(); + tvLastVisited = new QTreeView(); + leVisitedSearch = new QLineEdit(); + + + + QVBoxLayout* layVisited = new QVBoxLayout(); + layVisited->addWidget(tvLastVisited); + layVisited->addWidget(leVisitedSearch); + layVisited->setContentsMargins(0,0,0,0); + twTreeHolder->addTab(new QWidget(), "Visited"); + twTreeHolder->page(0)->setLayout(layVisited); + + + + dummyBrowser = new BrowserView(); + browser = new BrowserView(); + //connect(browser, SIGNAL(clicked(Q3ListViewItem*)), this, SLOT(OnUpdateVisitedView(Q3ListViewItem*))); + connect(browser, SIGNAL(selectionChanged(Q3ListViewItem *)), + this, SLOT(OnUpdateVisitedView(Q3ListViewItem *))); + connect(leVisitedSearch, SIGNAL(returnPressed()), this, SLOT(OnPerformVisitedFiltering())); + + + + SetupTreeModel(); + splTreeTab = new QSplitter(Qt::Vertical, spl1); + splTreeTab->addWidget(browser); + splTreeTab->addWidget(twTreeHolder); cppAction = new QAction(tr("C++"),0); connect(cppAction, SIGNAL(triggered()),browser, SLOT(OnGenerateCpp())); javaAction = new QAction( tr("Java"),0); @@ -498,15 +538,13 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) pythonAction->setVisible(false); idlAction->setVisible(false); - - ws = new QWorkspace(spl2); comment = new MultiLineEdit(spl2); set_commented(0); connect(comment, SIGNAL(textChanged()), this, SLOT(comment_changed())); - spl1->moveToFirst(browser); + spl1->moveToFirst(splTreeTab); spl2->moveToFirst(ws); @@ -576,6 +614,106 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) statusBar()->message(TR("Ready"), 2000); } +void UmlWindow::SetupTreeModel() +{ + treeModel = new TreeModel(); + SetupTreeController(); + + TreeItem* pointer = new TreeItem(0); + templateRootItem = QSharedPointer(pointer); + QList > items; + pointer->SetController(treeController); + pointer->addChildren(items); + //result = new BrowserClass(s, parent, new ClassData, id); + treeRootData = new BrowserPackage(QString("hmm"), dummyBrowser); + + pointer->SetInternalData(treeRootData); + treeController->SetColumns(QStringList() << "class"); + treeModel->InsertRootItem(templateRootItem); + //templateRootItem->AddChildren(); + + tvLastVisited->setModel(treeModel); + tvLastVisited->setContextMenuPolicy(Qt::CustomContextMenu); + tvLastVisited->setEditTriggers(QAbstractItemView::NoEditTriggers); + tvLastVisited->setColumnWidth(0, 230); + tvLastVisited->setExpandsOnDoubleClick(false); + tvLastVisited->setRootIsDecorated(true); + connect(tvLastVisited, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnTreeRequestsContextMenu(QPoint))); + connect(tvLastVisited, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnTreeItemDoubleClicked(QModelIndex))); + connect(treeModel, SIGNAL(dataEditFinished(QModelIndex)), this, SLOT(OnDataEditFinished(QModelIndex))); + + connect(tvLastVisited->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), + this, SLOT(OnPickSelectionFromVisited(QModelIndex,QModelIndex))); +} + + +void UmlWindow::SetupTreeController() +{ + treeController = QSharedPointer >( new ItemController()); + treeController->AddGetter(QPair(0,0), + + [] (const BrowserNode* data) + { + if(data) + return QVariant(data->get_name()); + else + return QVariant(); + } + ); + + treeController->AddGetter(QPair(0,1), + + [] (const BrowserNode* data) + { + 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; + } + ); + + + +} + +void UmlWindow::PerformFiltering() +{ + std::function dataAccessFunc = + [](BrowserNode* data){return QVariant(data->get_name());}; + + std::function > ()> checksFunc = + std::bind(&UmlWindow::CreateCheckList, this); + + TreeFunctions::FilterTreeAndRestoreNodes + (dataAccessFunc, checksFunc, + expandedNodes, tvLastVisited, treeModel, templateRootItem ); +} + +QList > UmlWindow::CreateCheckList() +{ + QList > result; + if(!leVisitedSearch->text().trimmed().isEmpty()) + { + QString value = leVisitedSearch->text(); + std::function addressFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_name().contains(value); + return match; + }; + result.append(addressFilterFunc); + } + return result; +} UmlWindow::~UmlWindow() { @@ -2369,6 +2507,57 @@ void UmlWindow::keyPressEvent(QKeyEvent * e) QMainWindow::keyPressEvent(e); } +void UmlWindow::OnUpdateVisitedView(Q3ListViewItem * item) +{ + BrowserNode* itemAsNode = static_cast(item); + itemAsNode = itemAsNode->get_first_generatable_node(); + + QList > checkList; + QString value = itemAsNode->get_name(); + std::function nameFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_name() == value; + return match; + }; + + + QList > modifyList; + TreeFunctions::ModifierFunction modifyFunc = [] (TreeItemInterface* interface) + { + TreeItemInterface* parent = interface->parent(); + if(parent) + parent->removeChildren(parent->GetIndexOfChild(interface),1); + }; + + TreeFunctions::RecursiveModify(templateRootItem.data(), checkList << nameFilterFunc, modifyList << modifyFunc, true, false); + + + TreeItem* pointer = new TreeItem(0); + QSharedPointer interfaceItem(pointer); + + pointer->SetController(treeController); + + pointer->SetInternalData(itemAsNode); + pointer->SetParent(templateRootItem); + QList > items; + items << interfaceItem; + templateRootItem->AddChildren(items); + treeModel->InsertRootItem(templateRootItem); +} + +void UmlWindow::OnPerformVisitedFiltering() +{ + PerformFiltering(); +} + +void UmlWindow::OnPickSelectionFromVisited(const QModelIndex & current, const QModelIndex &) +{ + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* itemAsNode = static_cast(itemAsInterface->InternalPointer()); + itemAsNode->select_in_browser(); +} + void UmlWindow::whats_this() const { QWhatsThis::enterWhatsThisMode(); diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index dbffcb7fd..ec8f439a4 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -37,6 +37,9 @@ #include #include #include +#include +#include +#include "Libs/L_UniversalModels/include/ItemController.h" class Q3CanvasView; class QWorkspace; @@ -55,6 +58,12 @@ 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 Q3ListViewItem; class UmlWindow : public QMainWindow { Q_OBJECT @@ -62,8 +71,32 @@ class UmlWindow : public QMainWindow protected: static UmlWindow * the; - QWorkspace * ws; - BrowserView * browser; + QWorkspace * ws = nullptr; + BrowserView * browser = nullptr; + BrowserView * dummyBrowser = nullptr; + + // perverted stuff + QTabWidget* twTreeHolder = nullptr; + QTreeView* tvLastVisited = nullptr; + QWidget* wdgLeftBarHolder = nullptr; + QLineEdit* leVisitedSearch = nullptr; + QSplitter* splTreeTab = nullptr; + TreeModel* treeModel = nullptr; + QMenu* treeItemMenu = nullptr; + + bool isFilteredTree = false; + QStringList expandedNodes; + QSharedPointer templateRootItem; + QSharedPointer > treeController; + BrowserNode* treeRootData; + + void SetupTreeModel(); + void SetupTreeController(); + void PerformFiltering(); + QList > CreateCheckList(); + + + // end of perverted stuff MultiLineEdit * comment; BrowserNode * commented; // the commented object QToolBar * projectTools; @@ -241,8 +274,12 @@ private slots: virtual void keyPressEvent(QKeyEvent * e); + public slots: void whats_this() const; + void OnUpdateVisitedView(Q3ListViewItem*); + void OnPerformVisitedFiltering(); + void OnPickSelectionFromVisited(const QModelIndex&,const QModelIndex& ); }; diff --git a/src/dialog/EdgeMenuDialog.h b/src/dialog/EdgeMenuDialog.h index b76377387..ca33248b0 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. // diff --git a/src/dialog/edgemenudialogbase.cpp b/src/dialog/edgemenudialogbase.cpp index 13fa7cd3d..26c2afe5f 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. // diff --git a/src/dialog/edgemenudialogbase.h b/src/dialog/edgemenudialogbase.h index 85d8e9c77..5786b1d8d 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. // diff --git a/src/dialog/edgemenudialogqt4.h b/src/dialog/edgemenudialogqt4.h index 5568aedfd..41b1fa2eb 100644 --- a/src/dialog/edgemenudialogqt4.h +++ b/src/dialog/edgemenudialogqt4.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/douml.pro b/src/douml.pro index 3ff76651c..43ea4028e 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -1,7 +1,7 @@ TEMPLATE = app INCLUDEPATH += browser data diagram dialog misc tool xpm DEPENDPATH += browser data diagram dialog misc tool xpm -INCLUDEPATH += boost src ui .. $$PWD +INCLUDEPATH += boost src ui .. $$PWD Libs/L_UniversalModels #CONFIG += qt warn_on debug CONFIG(debug, debug|release) { CONFIG -= debug release @@ -564,7 +564,7 @@ UI_DIR = ui DESTDIR = ../bin QMAKE_CXXFLAGS += -std=gnu++11 - +LIBS += -L../bin -lUniversalModelsd RESOURCES += icons.qrc FORMS += \ diff --git a/src/misc/ClipboardManager.cpp b/src/misc/ClipboardManager.cpp index 31b528239..8fca8e0d8 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. // diff --git a/src/misc/ClipboardManager.h b/src/misc/ClipboardManager.h index c805c5d83..66e49cb3b 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. // diff --git a/src/tagmanagement/cpptagmanagement.cpp b/src/tagmanagement/cpptagmanagement.cpp index 4254ee648..065f34a0c 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. // diff --git a/src/tagmanagement/cpptagmanagement.h b/src/tagmanagement/cpptagmanagement.h index 14462696b..51451271b 100644 --- a/src/tagmanagement/cpptagmanagement.h +++ b/src/tagmanagement/cpptagmanagement.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/ui/constructorinitializerdialog.cpp b/src/ui/constructorinitializerdialog.cpp index 07b359077..a475cc92b 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. // diff --git a/src/ui/constructorinitializerdialog.h b/src/ui/constructorinitializerdialog.h index f115786fb..88a93a0fb 100644 --- a/src/ui/constructorinitializerdialog.h +++ b/src/ui/constructorinitializerdialog.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/ui/operationwidgetcpp.cpp b/src/ui/operationwidgetcpp.cpp index 1aa9fdbef..45a18b7d3 100644 --- a/src/ui/operationwidgetcpp.cpp +++ b/src/ui/operationwidgetcpp.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/ui/operationwidgetcpp.h b/src/ui/operationwidgetcpp.h index 89e80498f..1be9b2b88 100644 --- a/src/ui/operationwidgetcpp.h +++ b/src/ui/operationwidgetcpp.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // From 1471b2241a9d01e4445ba8f4b86ebea01b5d461f Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 16 Feb 2013 15:30:55 +0400 Subject: [PATCH 016/297] just a fix to save changes forgotten in a previous commit --- src/Factories/EdgeToolBarCreation.cpp | 2 +- src/Libs/L_UniversalModels/L_UniversalModels.pro | 3 --- src/Libs/L_UniversalModels/include/AdaptingTableModel.h | 2 +- src/Libs/L_UniversalModels/include/ItemController.h | 2 +- src/Libs/L_UniversalModels/include/TableDataInterface.h | 2 +- src/Libs/L_UniversalModels/include/TableDataListHolder.h | 2 +- src/Libs/L_UniversalModels/include/TreeItem.h | 2 +- src/Libs/L_UniversalModels/include/TreeItemInterface.h | 2 +- src/Libs/L_UniversalModels/include/TreeModel.h | 2 +- src/Libs/L_UniversalModels/include/l_tree_controller_global.h | 2 +- src/Libs/L_UniversalModels/include/treeitemfunctions.h | 2 +- src/Libs/L_UniversalModels/include/treeviewfunctions.h | 2 +- src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp | 2 +- src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp | 2 +- src/Libs/L_UniversalModels/src/TableDataInterface.cpp | 2 +- src/Libs/L_UniversalModels/src/TreeItemInterface.cpp | 2 +- src/Libs/L_UniversalModels/src/TreeModel.cpp | 2 +- src/Libs/L_UniversalModels/src/treeviewfunctions.cpp | 2 +- src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp | 2 +- 19 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/Factories/EdgeToolBarCreation.cpp b/src/Factories/EdgeToolBarCreation.cpp index caf084df8..e50206552 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. // diff --git a/src/Libs/L_UniversalModels/L_UniversalModels.pro b/src/Libs/L_UniversalModels/L_UniversalModels.pro index ac4cf1842..a67d45df9 100644 --- a/src/Libs/L_UniversalModels/L_UniversalModels.pro +++ b/src/Libs/L_UniversalModels/L_UniversalModels.pro @@ -36,9 +36,6 @@ HEADERS += include/TreeModel.h \ SOURCES += src/TreeModel.cpp \ src/TreeItemInterface.cpp \ - src/InterfaceAwareTreeData.cpp \ - src/AddressTemplateData.cpp \ - src/AddressTemplateTreeData.cpp \ src/AdaptingTableModel.cpp \ src/TableDataInterface.cpp \ src/AdaptingTableModelPrivate.cpp \ diff --git a/src/Libs/L_UniversalModels/include/AdaptingTableModel.h b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h index 0021cb2bf..08222a104 100644 --- a/src/Libs/L_UniversalModels/include/AdaptingTableModel.h +++ b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/ItemController.h b/src/Libs/L_UniversalModels/include/ItemController.h index 41cfba306..e93007f81 100644 --- a/src/Libs/L_UniversalModels/include/ItemController.h +++ b/src/Libs/L_UniversalModels/include/ItemController.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/TableDataInterface.h b/src/Libs/L_UniversalModels/include/TableDataInterface.h index e78329875..9c18ca323 100644 --- a/src/Libs/L_UniversalModels/include/TableDataInterface.h +++ b/src/Libs/L_UniversalModels/include/TableDataInterface.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/TableDataListHolder.h b/src/Libs/L_UniversalModels/include/TableDataListHolder.h index 230398b10..21c39cf4e 100644 --- a/src/Libs/L_UniversalModels/include/TableDataListHolder.h +++ b/src/Libs/L_UniversalModels/include/TableDataListHolder.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/TreeItem.h b/src/Libs/L_UniversalModels/include/TreeItem.h index 22a9cdead..f0db934cb 100644 --- a/src/Libs/L_UniversalModels/include/TreeItem.h +++ b/src/Libs/L_UniversalModels/include/TreeItem.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/TreeItemInterface.h b/src/Libs/L_UniversalModels/include/TreeItemInterface.h index 10efa061e..7ab4e61de 100644 --- a/src/Libs/L_UniversalModels/include/TreeItemInterface.h +++ b/src/Libs/L_UniversalModels/include/TreeItemInterface.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/TreeModel.h b/src/Libs/L_UniversalModels/include/TreeModel.h index 634b92fba..814c0ba2c 100644 --- a/src/Libs/L_UniversalModels/include/TreeModel.h +++ b/src/Libs/L_UniversalModels/include/TreeModel.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/l_tree_controller_global.h b/src/Libs/L_UniversalModels/include/l_tree_controller_global.h index e48641ac2..1cee860bf 100644 --- a/src/Libs/L_UniversalModels/include/l_tree_controller_global.h +++ b/src/Libs/L_UniversalModels/include/l_tree_controller_global.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/treeitemfunctions.h b/src/Libs/L_UniversalModels/include/treeitemfunctions.h index f1c793cda..5d802215e 100644 --- a/src/Libs/L_UniversalModels/include/treeitemfunctions.h +++ b/src/Libs/L_UniversalModels/include/treeitemfunctions.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/include/treeviewfunctions.h b/src/Libs/L_UniversalModels/include/treeviewfunctions.h index 21cce8872..14c82b02e 100644 --- a/src/Libs/L_UniversalModels/include/treeviewfunctions.h +++ b/src/Libs/L_UniversalModels/include/treeviewfunctions.h @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp index 045d5aec3..70657ebf5 100644 --- a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp +++ b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp index c84fa8b03..b595ea87d 100644 --- a/src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp +++ b/src/Libs/L_UniversalModels/src/AdaptingTableModelPrivate.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/src/TableDataInterface.cpp b/src/Libs/L_UniversalModels/src/TableDataInterface.cpp index 026a4d190..c86324414 100644 --- a/src/Libs/L_UniversalModels/src/TableDataInterface.cpp +++ b/src/Libs/L_UniversalModels/src/TableDataInterface.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp b/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp index 23dd38e0d..7358204d1 100644 --- a/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp +++ b/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp index 94476187e..2ead97c27 100644 --- a/src/Libs/L_UniversalModels/src/TreeModel.cpp +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp b/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp index 4775f784e..7aa208f1b 100644 --- a/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp +++ b/src/Libs/L_UniversalModels/src/treeviewfunctions.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // diff --git a/src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp b/src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp index 1ae59bc8f..26d3a04f5 100644 --- a/src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp +++ b/src/Libs/L_UniversalModels/src/treeviewtemplatefunctions.cpp @@ -1,6 +1,6 @@ // ************************************************************************* // -// Copyright 2012-2013 Nikolai Marchenko . +// Copyright 2012-2013 Nikolai Marchenko. // // This file is part of the Douml Uml Toolkit. // From 8fa03b09630fdbbc3bc8b9ba3460fe66e61718f4 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Feb 2013 02:46:36 +0400 Subject: [PATCH 017/297] non working moving catalog functionality into a separate widget --- .../L_UniversalModels/L_UniversalModels.pro | 6 +- .../include/genericeventfilter.h | 22 ++ .../src/genericeventfilter.cpp | 26 ++ src/browser/BrowserNode.cpp | 7 +- src/browser/BrowserNode.h | 11 + src/diagram/BrowserView.cpp | 5 + src/diagram/BrowserView.h | 3 + src/diagram/UmlWindow.cpp | 183 +------------- src/diagram/UmlWindow.h | 20 +- src/douml.pro | 9 +- src/ui/catalogwidget.cpp | 234 ++++++++++++++++++ src/ui/catalogwidget.h | 82 ++++++ src/ui/catalogwidget.ui | 91 +++++++ 13 files changed, 497 insertions(+), 202 deletions(-) create mode 100644 src/Libs/L_UniversalModels/include/genericeventfilter.h create mode 100644 src/Libs/L_UniversalModels/src/genericeventfilter.cpp create mode 100644 src/ui/catalogwidget.cpp create mode 100644 src/ui/catalogwidget.h create mode 100644 src/ui/catalogwidget.ui diff --git a/src/Libs/L_UniversalModels/L_UniversalModels.pro b/src/Libs/L_UniversalModels/L_UniversalModels.pro index a67d45df9..6fc38365b 100644 --- a/src/Libs/L_UniversalModels/L_UniversalModels.pro +++ b/src/Libs/L_UniversalModels/L_UniversalModels.pro @@ -32,7 +32,8 @@ HEADERS += include/TreeModel.h \ include/ItemController.h \ include/treeviewfunctions.h \ include/treeviewtemplatefunctions.h \ - include/treeitemfunctions.h + include/treeitemfunctions.h \ + include/genericeventfilter.h SOURCES += src/TreeModel.cpp \ src/TreeItemInterface.cpp \ @@ -40,7 +41,8 @@ SOURCES += src/TreeModel.cpp \ src/TableDataInterface.cpp \ src/AdaptingTableModelPrivate.cpp \ src/treeviewfunctions.cpp \ - src/treeviewtemplatefunctions.cpp + src/treeviewtemplatefunctions.cpp \ + src/genericeventfilter.cpp Debug{ MOC_DIR = .../.././build/MOC_debug/UniversalModels diff --git a/src/Libs/L_UniversalModels/include/genericeventfilter.h b/src/Libs/L_UniversalModels/include/genericeventfilter.h new file mode 100644 index 000000000..f45a2cd74 --- /dev/null +++ b/src/Libs/L_UniversalModels/include/genericeventfilter.h @@ -0,0 +1,22 @@ +#ifndef GENERICEVENTFILTER_H +#define GENERICEVENTFILTER_H +#include +#include +#include +#include +#include "l_tree_controller_global.h" +class L_TREE_CONTROLLER_EXPORT GenericEventFilter: public QObject +{ +Q_OBJECT +private: + std::function eventProcessor; +public: + GenericEventFilter(QObject* parent = 0); + virtual ~GenericEventFilter(); + void SetEventProcessor(std::function); +protected: + bool eventFilter(QObject *obj, QEvent *event); + + +}; +#endif // GENERICEVENTFILTER_H diff --git a/src/Libs/L_UniversalModels/src/genericeventfilter.cpp b/src/Libs/L_UniversalModels/src/genericeventfilter.cpp new file mode 100644 index 000000000..a53519def --- /dev/null +++ b/src/Libs/L_UniversalModels/src/genericeventfilter.cpp @@ -0,0 +1,26 @@ +#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 processor) +{ + eventProcessor = processor; +} diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 58e5bb1b5..d2de6b719 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -103,13 +103,14 @@ Q3PtrDict SynonymousPath(259); 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) { + viewptr = parent; } BrowserNode::BrowserNode(QString s, BrowserNode * parent) @@ -1197,6 +1198,8 @@ void BrowserNode::unmark_all() UmlWindow::set_marked_generation(); else UmlWindow::set_selected_generation(); + if(viewptr) + viewptr->send_marked(get_marked_nodes()); } void BrowserNode::move(BrowserNode * bn, BrowserNode * after) @@ -1240,6 +1243,8 @@ void BrowserNode::toggle_mark() UmlWindow::set_marked_generation(); else UmlWindow::set_selected_generation(); + if(viewptr) + viewptr->send_marked(get_marked_nodes()); } void BrowserNode::setup_generatable_types() diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index 9760c6a0e..daabe954c 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -99,6 +99,7 @@ class BrowserNode : public Q3ListViewItem, static QString FullPathPrefix; static QString FullPathPostfix; static QString FullPathDotDot; + static BrowserView* viewptr; BrowserNode(); @@ -135,6 +136,16 @@ class BrowserNode : public Q3ListViewItem, static const Q3PtrList & marked_nodes() { return marked_list; } + static const QList get_marked_nodes() + { + Q3PtrListIterator it(marked_list); + QList result; + for (; it.current() != 0; ++it) + { + result.append(it.current()); + } + return result; + } static void setup_generatable_types(); static void unmark_all(); diff --git a/src/diagram/BrowserView.cpp b/src/diagram/BrowserView.cpp index a507c2be7..43b221d19 100644 --- a/src/diagram/BrowserView.cpp +++ b/src/diagram/BrowserView.cpp @@ -110,6 +110,11 @@ void BrowserView::remove_temporary_files() } } +void BrowserView::send_marked(QList list) +{ + emit marked_list(list); +} + BrowserView::~BrowserView() { remove_temporary_files(); diff --git a/src/diagram/BrowserView.h b/src/diagram/BrowserView.h index bc27c6e01..60e01bf63 100644 --- a/src/diagram/BrowserView.h +++ b/src/diagram/BrowserView.h @@ -90,6 +90,7 @@ class BrowserView : public Q3ListView static BrowserNode * selected_item(); static void force_visible(Q3ListViewItem *); static void remove_temporary_files(); + void send_marked(QList); @@ -114,6 +115,8 @@ public slots: void OnGeneratePhp(); void OnGeneratePython(); void OnGenerateIdl(); +signals: + void marked_list(QList); }; #endif diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 3446ab4bc..cbb0617f3 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -105,19 +105,10 @@ #include "fileprint.xpm" #include "browsersearch.xpm" #include "misc/ClipboardManager.h" +#include "ui/catalogwidget.h" #include #include -#include - -// 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 "ProfiledStereotypes.h" -#include "ClassData.h" -#include static QString TemplateProject; @@ -488,35 +479,12 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) spl1 = new QSplitter(Qt::Horizontal, this, "spl1"); spl2 = new QSplitter(Qt::Vertical, spl1, "spl2"); - - twTreeHolder = new QTabWidget(); - tvLastVisited = new QTreeView(); - leVisitedSearch = new QLineEdit(); - - - - QVBoxLayout* layVisited = new QVBoxLayout(); - layVisited->addWidget(tvLastVisited); - layVisited->addWidget(leVisitedSearch); - layVisited->setContentsMargins(0,0,0,0); - twTreeHolder->addTab(new QWidget(), "Visited"); - twTreeHolder->page(0)->setLayout(layVisited); - - - - dummyBrowser = new BrowserView(); browser = new BrowserView(); - //connect(browser, SIGNAL(clicked(Q3ListViewItem*)), this, SLOT(OnUpdateVisitedView(Q3ListViewItem*))); - connect(browser, SIGNAL(selectionChanged(Q3ListViewItem *)), - this, SLOT(OnUpdateVisitedView(Q3ListViewItem *))); - connect(leVisitedSearch, SIGNAL(returnPressed()), this, SLOT(OnPerformVisitedFiltering())); + wdgCatalog = new CatalogWidget; - - - SetupTreeModel(); splTreeTab = new QSplitter(Qt::Vertical, spl1); splTreeTab->addWidget(browser); - splTreeTab->addWidget(twTreeHolder); + splTreeTab->addWidget(wdgCatalog); cppAction = new QAction(tr("C++"),0); connect(cppAction, SIGNAL(triggered()),browser, SLOT(OnGenerateCpp())); javaAction = new QAction( tr("Java"),0); @@ -614,107 +582,6 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) statusBar()->message(TR("Ready"), 2000); } -void UmlWindow::SetupTreeModel() -{ - treeModel = new TreeModel(); - SetupTreeController(); - - TreeItem* pointer = new TreeItem(0); - templateRootItem = QSharedPointer(pointer); - QList > items; - pointer->SetController(treeController); - pointer->addChildren(items); - //result = new BrowserClass(s, parent, new ClassData, id); - treeRootData = new BrowserPackage(QString("hmm"), dummyBrowser); - - pointer->SetInternalData(treeRootData); - treeController->SetColumns(QStringList() << "class"); - treeModel->InsertRootItem(templateRootItem); - //templateRootItem->AddChildren(); - - tvLastVisited->setModel(treeModel); - tvLastVisited->setContextMenuPolicy(Qt::CustomContextMenu); - tvLastVisited->setEditTriggers(QAbstractItemView::NoEditTriggers); - tvLastVisited->setColumnWidth(0, 230); - tvLastVisited->setExpandsOnDoubleClick(false); - tvLastVisited->setRootIsDecorated(true); - connect(tvLastVisited, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnTreeRequestsContextMenu(QPoint))); - connect(tvLastVisited, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnTreeItemDoubleClicked(QModelIndex))); - connect(treeModel, SIGNAL(dataEditFinished(QModelIndex)), this, SLOT(OnDataEditFinished(QModelIndex))); - - connect(tvLastVisited->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(OnPickSelectionFromVisited(QModelIndex,QModelIndex))); -} - - -void UmlWindow::SetupTreeController() -{ - treeController = QSharedPointer >( new ItemController()); - treeController->AddGetter(QPair(0,0), - - [] (const BrowserNode* data) - { - if(data) - return QVariant(data->get_name()); - else - return QVariant(); - } - ); - - treeController->AddGetter(QPair(0,1), - - [] (const BrowserNode* data) - { - 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; - } - ); - - - -} - -void UmlWindow::PerformFiltering() -{ - std::function dataAccessFunc = - [](BrowserNode* data){return QVariant(data->get_name());}; - - std::function > ()> checksFunc = - std::bind(&UmlWindow::CreateCheckList, this); - - TreeFunctions::FilterTreeAndRestoreNodes - (dataAccessFunc, checksFunc, - expandedNodes, tvLastVisited, treeModel, templateRootItem ); -} - -QList > UmlWindow::CreateCheckList() -{ - QList > result; - if(!leVisitedSearch->text().trimmed().isEmpty()) - { - QString value = leVisitedSearch->text(); - std::function addressFilterFunc = [value](TreeItemInterface* iface) - { - BrowserNode* data = static_cast(iface->InternalPointer()); - bool match = data->get_name().contains(value); - return match; - }; - result.append(addressFilterFunc); - } - return result; -} - UmlWindow::~UmlWindow() { BrowserView::remove_temporary_files(); @@ -2507,50 +2374,6 @@ void UmlWindow::keyPressEvent(QKeyEvent * e) QMainWindow::keyPressEvent(e); } -void UmlWindow::OnUpdateVisitedView(Q3ListViewItem * item) -{ - BrowserNode* itemAsNode = static_cast(item); - itemAsNode = itemAsNode->get_first_generatable_node(); - - QList > checkList; - QString value = itemAsNode->get_name(); - std::function nameFilterFunc = [value](TreeItemInterface* iface) - { - BrowserNode* data = static_cast(iface->InternalPointer()); - bool match = data->get_name() == value; - return match; - }; - - - QList > modifyList; - TreeFunctions::ModifierFunction modifyFunc = [] (TreeItemInterface* interface) - { - TreeItemInterface* parent = interface->parent(); - if(parent) - parent->removeChildren(parent->GetIndexOfChild(interface),1); - }; - - TreeFunctions::RecursiveModify(templateRootItem.data(), checkList << nameFilterFunc, modifyList << modifyFunc, true, false); - - - TreeItem* pointer = new TreeItem(0); - QSharedPointer interfaceItem(pointer); - - pointer->SetController(treeController); - - pointer->SetInternalData(itemAsNode); - pointer->SetParent(templateRootItem); - QList > items; - items << interfaceItem; - templateRootItem->AddChildren(items); - treeModel->InsertRootItem(templateRootItem); -} - -void UmlWindow::OnPerformVisitedFiltering() -{ - PerformFiltering(); -} - void UmlWindow::OnPickSelectionFromVisited(const QModelIndex & current, const QModelIndex &) { TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index ec8f439a4..f8e7ac7a7 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -64,6 +64,7 @@ class TreeItemInterface; class TreeModel; class QLineEdit; class Q3ListViewItem; +class CatalogWidget; class UmlWindow : public QMainWindow { Q_OBJECT @@ -76,26 +77,13 @@ class UmlWindow : public QMainWindow BrowserView * dummyBrowser = nullptr; // perverted stuff - QTabWidget* twTreeHolder = nullptr; - QTreeView* tvLastVisited = nullptr; - QWidget* wdgLeftBarHolder = nullptr; - QLineEdit* leVisitedSearch = nullptr; QSplitter* splTreeTab = nullptr; - TreeModel* treeModel = nullptr; - QMenu* treeItemMenu = nullptr; - - bool isFilteredTree = false; - QStringList expandedNodes; - QSharedPointer templateRootItem; - QSharedPointer > treeController; - BrowserNode* treeRootData; - + CatalogWidget* wdgCatalog = nullptr; void SetupTreeModel(); void SetupTreeController(); void PerformFiltering(); QList > CreateCheckList(); - // end of perverted stuff MultiLineEdit * comment; BrowserNode * commented; // the commented object @@ -277,8 +265,8 @@ private slots: public slots: void whats_this() const; - void OnUpdateVisitedView(Q3ListViewItem*); - void OnPerformVisitedFiltering(); + //void OnUpdateVisitedView(Q3ListViewItem*); + //void OnPerformVisitedFiltering(); void OnPickSelectionFromVisited(const QModelIndex&,const QModelIndex& ); diff --git a/src/douml.pro b/src/douml.pro index 43ea4028e..5dd52bdfc 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -232,7 +232,8 @@ HEADERS = \ ui/constructorinitializerdialog.h \ tagmanagement/cpptagmanagement.h \ dialog/edgemenudialogqt4.h \ - dialog/edgemenudialogbase.h + dialog/edgemenudialogbase.h \ + ui/catalogwidget.h SOURCES = \ @@ -511,7 +512,8 @@ SOURCES = \ tagmanagement/cpptagmanagement.cpp \ dialog/edgemenudialogqt4.cpp \ dialog/edgemenudialogbase.cpp \ - misc/codec.cpp + misc/codec.cpp \ + ui/catalogwidget.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM @@ -569,5 +571,6 @@ RESOURCES += icons.qrc FORMS += \ ui/operationwidgetcpp.ui \ - ui/constructorinitializerdialog.ui + ui/constructorinitializerdialog.ui \ + ui/catalogwidget.ui diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp new file mode 100644 index 000000000..3481b7930 --- /dev/null +++ b/src/ui/catalogwidget.cpp @@ -0,0 +1,234 @@ +#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/BrowserPackage.h" +#include "ProfiledStereotypes.h" +#include "ClassData.h" +#include +#include + +CatalogWidget::CatalogWidget( QWidget *parent) : + QWidget(parent), + ui(new Ui::CatalogWidget) +{ + ui->setupUi(this); +} + +CatalogWidget::~CatalogWidget() +{ + delete ui; +} + +bool ProcessDragDrop(QObject* /*obj*/, QEvent *event, QTreeView* view) +{ + if(event->type() == QEvent::DragMove) + { + QModelIndex index =view->selectionModel()->currentIndex(); + if(!index.isValid()) + return true; + return true; + } + return false; +} + +void CatalogWidget::Init(BrowserView* view) +{ + originalView = view; + + connect(view, SIGNAL(selectionChanged(Q3ListViewItem *)), + this, SLOT(OnUpdateVisitedView(Q3ListViewItem *))); + connect(ui->leVisitedSearch, SIGNAL(returnPressed()), this, SLOT(OnPerformVisitedFiltering())); + + qRegisterMetaType>("QList"); + connect(view, SIGNAL(marked_list(QList)), this, SLOT(OnUpdateMarkedView(QList))); + + SetupTreeModel(tmodVisited, ui->tvVisitedNodes,rootVisitedInterface,controllerVisited,rootVisited, + originalView, SLOT(OnPickSelectionFromVisited( QModelIndex, QModelIndex ))); + SetupTreeModel(tmodMarked, ui->tvMarkedNodes,rootMarkedInterface,controllerMarked,rootMarked, + originalView, SLOT(OnPickSelectionFromVisited(QModelIndex,QModelIndex ))); + SetupTreeModel(tmodFavourites, ui->tvFavourites,rootFavouritesInterface,controllerFavourites,rootFavourites, + originalView, SLOT(OnPickSelectionFromVisited( QModelIndex, QModelIndex ))); + + + dragDropFilter = new GenericEventFilter(this); + dragDropFilter->SetEventProcessor(std::bind(ProcessDragDrop,std::placeholders::_1, std::placeholders::_2, ui->tvFavourites)); + ui->tvFavourites->installEventFilter(dragDropFilter); +} + + +void CatalogWidget::SetupTreeModel(TreeModel* model , QTreeView* view, + QSharedPointer &interface, + QSharedPointer > &controller, + QSharedPointer &data, BrowserView* originalView ,const char* slotName) +{ + model = new TreeModel(); + SetupTreeController(controller); + + TreeItem* pointer = new TreeItem(0); + interface = QSharedPointer(pointer); + QList > items; + pointer->SetController(controller); + pointer->addChildren(items); + //result = new BrowserClass(s, parent, new ClassData, id); + data = QSharedPointer(new BrowserPackage(QString("hmm"), dummyView)); + + pointer->SetInternalData(data.data()); + controller->SetColumns(QStringList() << "class"); + model->InsertRootItem(interface); + //templateRootItem->AddChildren(); + + view->setModel(model); + view->setContextMenuPolicy(Qt::CustomContextMenu); + view->setEditTriggers(QAbstractItemView::NoEditTriggers); + view->setColumnWidth(0, 230); + view->setExpandsOnDoubleClick(false); + view->setRootIsDecorated(true); + connect(view, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnTreeRequestsContextMenu(QPoint))); + connect(view, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnTreeItemDoubleClicked(QModelIndex))); + connect(model, SIGNAL(dataEditFinished(QModelIndex)), this, SLOT(OnDataEditFinished(QModelIndex))); + + connect(view->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), + originalView, slotName); +} + + +void CatalogWidget::SetupTreeController(QSharedPointer >& treeController) +{ + treeController = QSharedPointer >( new ItemController()); + treeController->AddGetter(QPair(0,0), + + [] (const BrowserNode* data) + { + if(data) + return QVariant(data->get_name()); + else + return QVariant(); + } + ); + + treeController->AddGetter(QPair(0,1), + + [] (const BrowserNode* data) + { + 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 > CatalogWidget::CreateCheckList() +{ + QList > result; + if(!ui->leVisitedSearch->text().trimmed().isEmpty()) + { + QString value = ui->leVisitedSearch->text(); + std::function addressFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_name().contains(value, Qt::CaseInsensitive); + return match; + }; + result.append(addressFilterFunc); + } + return result; +} + + +void CatalogWidget::OnUpdateFavoutitesView() +{ +} + +void CatalogWidget::OnPerformVisitedFiltering() +{ + 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 interface) +{ + std::function dataAccessFunc = + [](BrowserNode* data){return QVariant(data->get_name());}; + + std::function > ()> checksFunc = + std::bind(&CatalogWidget::CreateCheckList, this); + + TreeFunctions::FilterTreeAndRestoreNodes + (dataAccessFunc, checksFunc, + expandedNodes, view, model, interface); +} + + + +void CatalogWidget::OnUpdateVisitedView(Q3ListViewItem * item) +{ + BrowserNode* itemAsNode = static_cast(item); + itemAsNode = itemAsNode->get_first_generatable_node(); + + QList > checkList; + QString value = itemAsNode->get_name(); + std::function nameFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_name() == value; + return match; + }; + + + QList > modifyList; + TreeFunctions::ModifierFunction modifyFunc = [] (TreeItemInterface* interface) + { + TreeItemInterface* parent = interface->parent(); + if(parent) + parent->removeChildren(parent->GetIndexOfChild(interface),1); + }; + + TreeFunctions::RecursiveModify(rootVisitedInterface.data(), checkList << nameFilterFunc, modifyList << modifyFunc, true, false); + + + TreeItem* pointer = new TreeItem(0); + QSharedPointer interfaceItem(pointer); + + pointer->SetController(controllerVisited); + + pointer->SetInternalData(itemAsNode); + pointer->SetParent(rootVisitedInterface); + QList > items; + items << interfaceItem; + rootVisitedInterface->AddChildren(items); + tmodVisited->InsertRootItem(rootVisitedInterface); +} + +void CatalogWidget::OnUpdateMarkedView(QList) +{ + +} diff --git a/src/ui/catalogwidget.h b/src/ui/catalogwidget.h new file mode 100644 index 000000000..a0d4f064c --- /dev/null +++ b/src/ui/catalogwidget.h @@ -0,0 +1,82 @@ +#ifndef CATALOGWIDGET_H +#define CATALOGWIDGET_H + +#include +#include +#include +#include "Libs/L_UniversalModels/include/ItemController.h" + +namespace Ui { +class CatalogWidget; +} +class BrowserView; +class TreeModel; +class QMenu; +class BrowserNode; +class TreeItemInterface; +class QTreeView; +class Q3ListViewItem; +class GenericEventFilter; +class CatalogWidget : public QWidget +{ + Q_OBJECT + +public: + explicit CatalogWidget(QWidget *parent = 0); + ~CatalogWidget(); + + // visited treeview + TreeModel* tmodVisited = nullptr; + bool isFilteredVisited = false; + QStringList expandedNodesVisited; + QSharedPointer rootVisitedInterface; + QSharedPointer > controllerVisited; + QSharedPointer rootVisited; + + // marked treeview + TreeModel* tmodMarked = nullptr; + bool isFilteredMarked = false; + QStringList expandedNodesMarked; + QSharedPointer rootMarkedInterface; + QSharedPointer > controllerMarked; + QSharedPointer rootMarked; + + // favourites treeview + TreeModel* tmodFavourites = nullptr; + bool isFilteredFavourites = false; + QStringList expandedNodesFavourites; + QSharedPointer rootFavouritesInterface; + QSharedPointer > controllerFavourites; + QSharedPointer rootFavourites; + + void Init(BrowserView*); + + GenericEventFilter* dragDropFilter; + + + +private: + Ui::CatalogWidget *ui = nullptr; + BrowserView* dummyView = nullptr; + BrowserView* originalView = nullptr; + + + void SetupTreeModel(TreeModel* ,QTreeView*, + QSharedPointer&, + QSharedPointer >&, + QSharedPointer&, BrowserView*, const char *); + void SetupTreeController(QSharedPointer >&); + void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); + QList > CreateCheckList(); + +public slots: + void OnPerformVisitedFiltering(); + void OnPerformMarkedFiltering(); + void OnPerformFavouritesFiltering(); + void OnUpdateVisitedView(Q3ListViewItem * item); + void OnUpdateMarkedView(QList); + void OnUpdateFavoutitesView(); + +}; + +#endif // CATALOGWIDGET_H diff --git a/src/ui/catalogwidget.ui b/src/ui/catalogwidget.ui new file mode 100644 index 000000000..8b82f11c4 --- /dev/null +++ b/src/ui/catalogwidget.ui @@ -0,0 +1,91 @@ + + + CatalogWidget + + + + 0 + 0 + 403 + 289 + + + + Form + + + + 0 + + + + + 2 + + + + Visited + + + + 0 + + + + + + + + + + + + Marked + + + + 0 + + + + + + + + + + + + Favourites + + + + 0 + + + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + + + + + From 35f2e96ecd488627cbf17039d755cd3f41d56bf2 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Feb 2013 05:31:01 +0400 Subject: [PATCH 018/297] cleaned up some stuff from project's generation settings --- .../L_UniversalModels/UML/models/42.session | 1 + .../L_UniversalModels/UML/models/cpp_includes | 8 ------- .../UML/models/generation_settings | 23 +------------------ .../L_UniversalModels/UML/models/models.prj | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 527cb3cd2..502ca1bb6 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -8,5 +8,6 @@ selected class_ref 714794 // TreeItem open class_ref 714794 // TreeItem class_ref 714922 // TreeItemInterface + deploymentview_ref 227626 // classes end end diff --git a/src/Libs/L_UniversalModels/UML/models/cpp_includes b/src/Libs/L_UniversalModels/UML/models/cpp_includes index 605468032..1a1177892 100644 --- a/src/Libs/L_UniversalModels/UML/models/cpp_includes +++ b/src/Libs/L_UniversalModels/UML/models/cpp_includes @@ -65,8 +65,6 @@ using namespace std;" "QScopedPointer" "#include " -"Point2" "#include " - "QPoint" "#include " "QMap" "#include " @@ -87,8 +85,6 @@ using namespace std;" "QGraphicsItem" "#include " -"RenderThread" "#include \"../Threading/renderthread.h\"" - "QPixmap" "#include " "QTimerEvent" "#include " @@ -119,8 +115,6 @@ using namespace std;" "QHash" "#include " -"Point2" "#include \"MapWrapper/Point2.h\"" - "QDateTime" "#include " "QEvent" "#include " @@ -131,5 +125,3 @@ using namespace std;" "QMultiMap" "#include " -"QSharedPointer" "#include \"MessageBase.h\"" - diff --git a/src/Libs/L_UniversalModels/UML/models/generation_settings b/src/Libs/L_UniversalModels/UML/models/generation_settings index 808b7d6b8..2bb48272e 100644 --- a/src/Libs/L_UniversalModels/UML/models/generation_settings +++ b/src/Libs/L_UniversalModels/UML/models/generation_settings @@ -4,7 +4,7 @@ cpp_include_with_path cpp_relative_path - type_forms 95 // uml cpp java idl cpp_in cpp_out cpp_inout cpp_return + 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}" @@ -38,7 +38,6 @@ "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}" - "point" "Point2" "dsf" "saas" "const ${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}" @@ -51,54 +50,34 @@ "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}" - "GISLibrary" "GISLibrary" "GISLibrary" "GISLibrary" "${type} *" "${type} &" "${type} *" "${type}" "scene" "QGraphicsScene" "df" "sdfsdf" "${type}" "${type} &" "${type} &" "${type} *" - "pointf" "Point2" "asdas" "asdasd" "${type}" "${type} &" "${type} &" "const ${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}" - "AniPoint" "AniPoint" "AniPoint" "AniPoint" "const ${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}" - "AniRouteSegment" "AniRouteSegment" "AniRouteSegment" "AniRouteSegment" "const ${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}" - "AbstractAniGraphicsObject" "AbstractAniGraphicsObject" "AbstractAniGraphicsObject" "AbstractAniGraphicsObject" "${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}" - "BasicObjectTreeItem" "BasicObjectTreeItem" "BasicObjectTreeItem" "BasicObjectTreeItem" "${type} *" "${type} &" "${type} &" "${type}" - "AbstractTreeItem" "AbstractTreeItem" "AbstractTreeItem" "AbstractTreeItem" "${type} *" "${type} &" "${type} &" "${type}" - "AbstractAniGraphicsIndividualObjectSettings" "AbstractAniGraphicsIndividualObjectSettings" "AbstractAniGraphicsIndividualObjectSettings" "AbstractAniGraphicsIndividualObjectSettings" "${type} *" "${type} &" "${type} &" "${type} *" - "AbstractFormInteractionInterface" "AbstractFormInteractionInterface" "AbstractFormInteractionInterface" "AbstractFormInteractionInterface" "${type} *" "${type} &" "${type} &" "${type} *" - "AniGraphicsAreaSettings" "AniGraphicsAreaSettings" "AniGraphicsAreaSettings" "AniGraphicsAreaSettings" "${type}" "${type} &" "${type} &" "${type} *" - "AbstractAniGraphicsAreaSettings" "AbstractAniGraphicsAreaSettings" "AbstractAniGraphicsAreaSettings" "AbstractAniGraphicsAreaSettings" "${type}" "${type} &" "${type} &" "${type} *" - "AbstractAniGraphicsPointSettings" "AbstractAniGraphicsPointSettings" "AbstractAniGraphicsPointSettings" "AbstractAniGraphicsPointSettings" "${type}" "${type} &" "${type} &" "${type} *" "hash" "QHash" "QHash" "QHash" "${type}" "${type} &" "${type} &" "${type}" - "AniGraphicsSettingsHash" "AniGraphicsSettingsHash" "AniGraphicsSettingsHash" "AniGraphicsSettingsHash" "${type} *" "${type} &" "${type} &" "${type} *" - "AniLineSegment" "AniLineSegment" "AniLineSegment" "AniLineSegment" "${type}" "${type} &" "${type} &" "const ${type} &" - "AniAbstractPainterInterface" "AniAbstractPainterInterface" "AniAbstractPainterInterface" "AniAbstractPainterInterface" "${type} *" "${type} &" "${type} &" "${type}" - "AniGeneralPointType" "AniGeneralPointType" "AniGeneralPointType" "AniGeneralPointType" "const ${type} &" "${type} &" "${type} &" "const ${type} &" - "AniObjectPaintingData" "AniObjectPaintingData" "AniObjectPaintingData" "AniObjectPaintingData" "${type}" "${type} &" "${type} &" "const ${type} &" "datetime" "QDateTime" "QDateTime" "QDateTime" "${type}" "${type} &" "${type} &" "${type}" "event" "QEvent" "QEvent" "QEvent" "${type} *" "${type} &" "${type} &" "${type}" - "SeparationResult" "SeparationResult" "SeparationResult" "SeparationResult" "${type}" "${type} &" "${type} &" "${type}" "ptr_vector_t" "boost::ptr_vector" "std::ptr_vector" "std::ptr_vector" "${type}" "${type} &" "${type} &" "${type}" "ref_ptr_vector_t" "boost::ptr_vector" "boost::ptr_vector" "boost::ptr_vector" "${type}" "${type} &" "${type} &" "${type}" - "Field" "Field" "Field" "Field" "${type} *" "${type} *" "${type} *" "${type}" "shared_pointer_vector_t" "QVector >" "QVector >" "QVector >" "${type}" "${type} &" "${type} &" "${type}" "ref_shared_pointer_vector_t" "QVector >&" "QVector >&" "QVector >&" "${type}" "${type} &" "${type} &" "${type}" "QSharedPointer" "QSharedPointer" "QSharedPointer" "QSharedPointer" "${type}" "${type} &" "${type} &" "${type}" "QVector >" "QVector >" "QVector >" "QVector >" "${type}" "${type} &" "${type} &" "${type}" - "QSharedPointer" "QSharedPointer" "QSharedPointer" "QSharedPointer" "${type}" "${type} &" "${type} &" "${type}" "multimap" "QMultiMap" "QMultiMap" "QMultiMap" "${type}" "${type} &" "${type} &" "${type}" relations_stereotypes 8 // uml cpp java pythonidl diff --git a/src/Libs/L_UniversalModels/UML/models/models.prj b/src/Libs/L_UniversalModels/UML/models/models.prj index 7cb108e32..0cc7751a7 100644 --- a/src/Libs/L_UniversalModels/UML/models/models.prj +++ b/src/Libs/L_UniversalModels/UML/models/models.prj @@ -1,6 +1,6 @@ format 75 "models" - revision 125 + revision 126 modified_by 42 "zeks" cpp_root_dir "E:\\Programming\\Douml\\src\\Libs\\L_UniversalModels\\" From 30d95f5e07f64f67fd0072df8b2f78416e231f6f Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Feb 2013 17:34:31 +0400 Subject: [PATCH 019/297] Technically, this commit can be used and is working. Last visited/Marked/Favourites views are working even though they do not yet have full feature set. L_UniversalModels in src/libs must be built separately prior to Douml compilation --- .../L_UniversalModels/UML/models/42.session | 6 +- .../include/treeitemfunctions.h | 27 ++ src/Libs/L_UniversalModels/src/TreeModel.cpp | 2 +- src/diagram/UmlWindow.cpp | 10 +- src/diagram/UmlWindow.h | 2 +- src/misc/UmlDrag.cpp | 8 +- src/misc/UmlDrag.h | 5 +- src/ui/catalogwidget.cpp | 251 ++++++++++++++---- src/ui/catalogwidget.h | 40 ++- src/ui/catalogwidget.ui | 3 +- 10 files changed, 278 insertions(+), 76 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 502ca1bb6..13667e2af 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,10 +4,8 @@ diagrams 1024 644 100 3 0 0 end show_stereotypes -selected class_ref 714794 // TreeItem +selected artifact_ref 639914 // TableDataInterface open - class_ref 714794 // TreeItem - class_ref 714922 // TreeItemInterface - deploymentview_ref 227626 // classes + artifact_ref 639914 // TableDataInterface end end diff --git a/src/Libs/L_UniversalModels/include/treeitemfunctions.h b/src/Libs/L_UniversalModels/include/treeitemfunctions.h index 5d802215e..61043a358 100644 --- a/src/Libs/L_UniversalModels/include/treeitemfunctions.h +++ b/src/Libs/L_UniversalModels/include/treeitemfunctions.h @@ -76,6 +76,33 @@ QSharedPointer RecursiveGetSubset(InterfaceType* rootItem, RootCh return newItem; } + +template +bool RecursiveSearch(InterfaceType* rootItem, RootChecks filterFunctions) +{ + bool result = true; + for(std::function filter: filterFunctions) + { + if(!filter(rootItem)) + { + result = false; + break; + } + } + if(result) + return true; + if(!rootItem->GetChildren().isEmpty()) + { + for(QSharedPointer child: rootItem->GetChildren()) + { + bool result = RecursiveSearch(child.data(), filterFunctions); + if(result) + return true; + } + } + return false; +} + template void ModifyNode(InterfaceType* node, ModifierFunctions modifierFunctions) { diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp index 2ead97c27..2839fd331 100644 --- a/src/Libs/L_UniversalModels/src/TreeModel.cpp +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -217,7 +217,7 @@ TreeItemInterface * TreeModel::RootItem() void TreeModel::InsertRootItem(QSharedPointer item) { reset(); - if(!rootItem.isNull()) + if(!rootItem.isNull() && rootItem->childCount() != 0) { int prevRows = rootItem->childCount(); int prevColumns = rootItem->columnCount(); diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index cbb0617f3..8a45d4c52 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -479,8 +479,10 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) spl1 = new QSplitter(Qt::Horizontal, this, "spl1"); spl2 = new QSplitter(Qt::Vertical, spl1, "spl2"); - browser = new BrowserView(); wdgCatalog = new CatalogWidget; + browser = new BrowserView(); + + wdgCatalog->Init(this, browser); splTreeTab = new QSplitter(Qt::Vertical, spl1); splTreeTab->addWidget(browser); @@ -1313,7 +1315,8 @@ void UmlWindow::closeEvent(QCloseEvent *) void UmlWindow::close_it() { - if (user_id() != 0) { + if (user_id() != 0) + { clear_select_historic(); ToolCom::close_all(); @@ -1329,6 +1332,7 @@ void UmlWindow::close_it() // empty the browser set_commented(0); + the->wdgCatalog->CleanupBeforeNewProject(); the->browser->clear(); // remove tools @@ -2374,7 +2378,7 @@ void UmlWindow::keyPressEvent(QKeyEvent * e) QMainWindow::keyPressEvent(e); } -void UmlWindow::OnPickSelectionFromVisited(const QModelIndex & current, const QModelIndex &) +void UmlWindow::OnPickSelectionFromItem(const QModelIndex & current, const QModelIndex &) { TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); BrowserNode* itemAsNode = static_cast(itemAsInterface->InternalPointer()); diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index f8e7ac7a7..4f6c35f2f 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -267,7 +267,7 @@ public slots: void whats_this() const; //void OnUpdateVisitedView(Q3ListViewItem*); //void OnPerformVisitedFiltering(); - void OnPickSelectionFromVisited(const QModelIndex&,const QModelIndex& ); + void OnPickSelectionFromItem(const QModelIndex&,const QModelIndex& ); }; diff --git a/src/misc/UmlDrag.cpp b/src/misc/UmlDrag.cpp index aa4f48aa3..6ea7eef1f 100644 --- a/src/misc/UmlDrag.cpp +++ b/src/misc/UmlDrag.cpp @@ -40,13 +40,14 @@ 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)); - + node = bn; memcpy(a.data(), &bn, sizeof(bn)); setEncodedData(a); @@ -105,3 +106,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..e09a5a79e 100644 --- a/src/misc/UmlDrag.h +++ b/src/misc/UmlDrag.h @@ -35,8 +35,9 @@ #include #include "UmlEnum.h" +#include "browser/BrowserNode.h" -class BrowserNode; +//class BrowserNode; class UmlDrag : public Q3StoredDrag { @@ -46,6 +47,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 +58,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/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index 3481b7930..17b84c795 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -10,38 +10,59 @@ #include "Libs/L_UniversalModels/include/genericeventfilter.h" #include "diagram/BrowserView.h" #include "browser/BrowserPackage.h" -#include "ProfiledStereotypes.h" +#include "diagram/UmlWindow.h" +#include "misc/UmlDrag.h" #include "ClassData.h" #include #include +#include CatalogWidget::CatalogWidget( QWidget *parent) : QWidget(parent), ui(new Ui::CatalogWidget) { ui->setupUi(this); + if(!dummyView) + dummyView = new BrowserView(); } CatalogWidget::~CatalogWidget() { + delete dummyView; delete ui; } -bool ProcessDragDrop(QObject* /*obj*/, QEvent *event, QTreeView* view) +bool ProcessDragDrop(QObject* /*obj*/, QEvent *event, std::function favsFunc) { - if(event->type() == QEvent::DragMove) + if(event->type() == QEvent::DragEnter) { - QModelIndex index =view->selectionModel()->currentIndex(); - if(!index.isValid()) + QList 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 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(BrowserView* view) +void CatalogWidget::Init(UmlWindow* window, BrowserView* view) { originalView = view; + mainWindow = window; connect(view, SIGNAL(selectionChanged(Q3ListViewItem *)), this, SLOT(OnUpdateVisitedView(Q3ListViewItem *))); @@ -51,23 +72,61 @@ void CatalogWidget::Init(BrowserView* view) connect(view, SIGNAL(marked_list(QList)), this, SLOT(OnUpdateMarkedView(QList))); SetupTreeModel(tmodVisited, ui->tvVisitedNodes,rootVisitedInterface,controllerVisited,rootVisited, - originalView, SLOT(OnPickSelectionFromVisited( QModelIndex, QModelIndex ))); + this, SLOT(OnSelectedInVisited(const QModelIndex &, const QModelIndex &))); SetupTreeModel(tmodMarked, ui->tvMarkedNodes,rootMarkedInterface,controllerMarked,rootMarked, - originalView, SLOT(OnPickSelectionFromVisited(QModelIndex,QModelIndex ))); + mainWindow, SLOT(OnPickSelectionFromItem(QModelIndex,QModelIndex ))); SetupTreeModel(tmodFavourites, ui->tvFavourites,rootFavouritesInterface,controllerFavourites,rootFavourites, - originalView, SLOT(OnPickSelectionFromVisited( QModelIndex, QModelIndex ))); + mainWindow, SLOT(OnPickSelectionFromItem( QModelIndex, QModelIndex ))); dragDropFilter = new GenericEventFilter(this); - dragDropFilter->SetEventProcessor(std::bind(ProcessDragDrop,std::placeholders::_1, std::placeholders::_2, ui->tvFavourites)); + std::functionfavsFunc = 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); + connect(ui->tvFavourites, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnFavouritesContextMenu(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::SetupTreeModel(TreeModel* model , QTreeView* view, + +} + +void CatalogWidget::StageSkipVisited() +{ + skipVisited = true; +} + +bool CatalogWidget::UseSkipVisited() +{ + if(skipVisited) + { + skipVisited = false; + return true; + } + return false; +} + + +void CatalogWidget::SetupTreeModel(TreeModel*& model , QTreeView* view, QSharedPointer &interface, QSharedPointer > &controller, - QSharedPointer &data, BrowserView* originalView ,const char* slotName) + QSharedPointer &data, QWidget* originalView ,const char* slotName) { model = new TreeModel(); SetupTreeController(controller); @@ -77,13 +136,12 @@ void CatalogWidget::SetupTreeModel(TreeModel* model , QTreeView* view, QList > items; pointer->SetController(controller); pointer->addChildren(items); - //result = new BrowserClass(s, parent, new ClassData, id); + data = QSharedPointer(new BrowserPackage(QString("hmm"), dummyView)); pointer->SetInternalData(data.data()); controller->SetColumns(QStringList() << "class"); model->InsertRootItem(interface); - //templateRootItem->AddChildren(); view->setModel(model); view->setContextMenuPolicy(Qt::CustomContextMenu); @@ -91,11 +149,8 @@ void CatalogWidget::SetupTreeModel(TreeModel* model , QTreeView* view, view->setColumnWidth(0, 230); view->setExpandsOnDoubleClick(false); view->setRootIsDecorated(true); - connect(view, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(OnTreeRequestsContextMenu(QPoint))); - connect(view, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnTreeItemDoubleClicked(QModelIndex))); - connect(model, SIGNAL(dataEditFinished(QModelIndex)), this, SLOT(OnDataEditFinished(QModelIndex))); - - connect(view->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), + if(originalView) + connect(view->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), originalView, slotName); } @@ -153,11 +208,116 @@ QList > CatalogWidget::CreateCheckList return result; } +bool CatalogWidget::RemoveExisting(BrowserNode * node, QSharedPointer rootInterface) +{ + QList > checkList; + QString value = node->get_name(); + std::function nameFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_name() == value; + return match; + }; + + + QList > modifyList; + TreeFunctions::ModifierFunction 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 > checkList; + QString value = node->get_name(); + UmlCode code = node->get_type(); + std::function nameFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_name() == value; + return match; + }; + std::function typeFilterFunc = [code](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_type() == code; + return match; + }; + bool result = TreeFunctions::RecursiveSearch(rootFavouritesInterface.data(), checkList << nameFilterFunc << typeFilterFunc); + if(result) + return true; + + TreeItem* pointer = new TreeItem(0); + QSharedPointer interfaceItem(pointer); + + pointer->SetController(controllerFavourites); + + pointer->SetInternalData(node); + pointer->SetParent(rootFavouritesInterface); + QList > items; + items << interfaceItem; + rootFavouritesInterface->AddChildren(items); + tmodFavourites->InsertRootItem(rootFavouritesInterface); + return true; +} + +void CatalogWidget::CreateFavouritesMenu() +{ + if(favouritesMenu.isNull()) + { + favouritesMenu.reset(new QMenu()); + favouritesMenu->addAction("Remove from favourites", this, SLOT(OnRemoveCurrentItemFromFavourites())); + } +} + +void CatalogWidget::PullNodeUpwardsInVisited(BrowserNode * itemAsNode) +{ + RemoveExisting(itemAsNode, rootVisitedInterface); + + TreeItem* pointer = new TreeItem(0); + QSharedPointer interfaceItem(pointer); + + pointer->SetController(controllerVisited); + + pointer->SetInternalData(itemAsNode); + pointer->SetParent(rootVisitedInterface); + QList > 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(current.internalPointer()); + BrowserNode* itemAsNode = static_cast(itemAsInterface->InternalPointer()); + itemAsNode->select_in_browser(); +} + +void CatalogWidget::OnRemoveCurrentItemFromFavourites() +{ + QModelIndex current = ui->tvFavourites->currentIndex(); + rootFavouritesInterface->removeChildren(current.row(),1); + tmodFavourites->InsertRootItem(rootFavouritesInterface); +} + +void CatalogWidget::OnFavouritesContextMenu(QPoint point) +{ + CreateFavouritesMenu(); + favouritesMenu->popup(ui->tvFavourites->mapToGlobal(point)); +} + void CatalogWidget::OnPerformVisitedFiltering() { PerformFiltering(expandedNodesVisited, ui->tvVisitedNodes, tmodVisited, rootVisitedInterface); @@ -191,44 +351,33 @@ void CatalogWidget::PerformFiltering(QStringList expandedNodes, QTreeView* view, void CatalogWidget::OnUpdateVisitedView(Q3ListViewItem * item) { + if(UseSkipVisited()) + return; + BrowserNode* itemAsNode = static_cast(item); itemAsNode = itemAsNode->get_first_generatable_node(); - QList > checkList; - QString value = itemAsNode->get_name(); - std::function nameFilterFunc = [value](TreeItemInterface* iface) - { - BrowserNode* data = static_cast(iface->InternalPointer()); - bool match = data->get_name() == value; - return match; - }; - + PullNodeUpwardsInVisited(itemAsNode); +} - QList > modifyList; - TreeFunctions::ModifierFunction modifyFunc = [] (TreeItemInterface* interface) +void CatalogWidget::OnUpdateMarkedView(QList markedItems) +{ + if(rootMarkedInterface.isNull()) + return; + QList > items; + rootMarkedInterface->removeChildren(0, rootMarkedInterface->childCount()); + for(BrowserNode * marked : markedItems) { - TreeItemInterface* parent = interface->parent(); - if(parent) - parent->removeChildren(parent->GetIndexOfChild(interface),1); - }; + TreeItem* pointer = new TreeItem(0); + QSharedPointer interfaceItem(pointer); - TreeFunctions::RecursiveModify(rootVisitedInterface.data(), checkList << nameFilterFunc, modifyList << modifyFunc, true, false); + pointer->SetController(controllerMarked); + pointer->SetInternalData(marked); + pointer->SetParent(rootMarkedInterface); - TreeItem* pointer = new TreeItem(0); - QSharedPointer interfaceItem(pointer); - - pointer->SetController(controllerVisited); - - pointer->SetInternalData(itemAsNode); - pointer->SetParent(rootVisitedInterface); - QList > items; - items << interfaceItem; - rootVisitedInterface->AddChildren(items); - tmodVisited->InsertRootItem(rootVisitedInterface); -} - -void CatalogWidget::OnUpdateMarkedView(QList) -{ - + items << interfaceItem; + } + rootMarkedInterface->AddChildren(items); + tmodMarked->InsertRootItem(rootMarkedInterface); } diff --git a/src/ui/catalogwidget.h b/src/ui/catalogwidget.h index a0d4f064c..87f564eea 100644 --- a/src/ui/catalogwidget.h +++ b/src/ui/catalogwidget.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "Libs/L_UniversalModels/include/ItemController.h" @@ -11,12 +12,13 @@ class CatalogWidget; } class BrowserView; class TreeModel; -class QMenu; + class BrowserNode; class TreeItemInterface; class QTreeView; class Q3ListViewItem; class GenericEventFilter; +class UmlWindow; class CatalogWidget : public QWidget { Q_OBJECT @@ -25,6 +27,19 @@ class CatalogWidget : public QWidget 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 favouritesMenu; + bool skipVisited = false; + // visited treeview TreeModel* tmodVisited = nullptr; bool isFilteredVisited = false; @@ -47,27 +62,23 @@ class CatalogWidget : public QWidget QStringList expandedNodesFavourites; QSharedPointer rootFavouritesInterface; QSharedPointer > controllerFavourites; + //QList >favouritesList; QSharedPointer rootFavourites; - void Init(BrowserView*); - GenericEventFilter* dragDropFilter; - -private: - Ui::CatalogWidget *ui = nullptr; - BrowserView* dummyView = nullptr; - BrowserView* originalView = nullptr; - - - void SetupTreeModel(TreeModel* ,QTreeView*, + void SetupTreeModel(TreeModel*& , QTreeView*, QSharedPointer&, QSharedPointer >&, - QSharedPointer&, BrowserView*, const char *); + QSharedPointer&, QWidget *window, const char *); void SetupTreeController(QSharedPointer >&); void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); QList > CreateCheckList(); + bool RemoveExisting(BrowserNode *,QSharedPointer ); + bool AddToFavourites(BrowserNode*); + void CreateFavouritesMenu(); + void PullNodeUpwardsInVisited(BrowserNode*); public slots: void OnPerformVisitedFiltering(); @@ -76,6 +87,11 @@ public slots: void OnUpdateVisitedView(Q3ListViewItem * item); void OnUpdateMarkedView(QList); void OnUpdateFavoutitesView(); + void OnSelectedInVisited(const QModelIndex &, const QModelIndex &); + void OnRemoveCurrentItemFromFavourites(); + void OnFavouritesContextMenu(QPoint); +signals: + }; diff --git a/src/ui/catalogwidget.ui b/src/ui/catalogwidget.ui index 8b82f11c4..141b26cfb 100644 --- a/src/ui/catalogwidget.ui +++ b/src/ui/catalogwidget.ui @@ -67,7 +67,7 @@ Qt::Horizontal - + @@ -77,7 +77,6 @@ - From 69f8324b8ae00e9861d1e52815653734ad846a25 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Feb 2013 21:08:04 +0400 Subject: [PATCH 020/297] fixed illegal name warning for relations --- .../L_UniversalModels/UML/models/42.session | 3 +- .../include/genericeventfilter.h | 23 ++++++++++++++ .../src/genericeventfilter.cpp | 23 ++++++++++++++ src/browser/BrowserNode.cpp | 5 ++++ src/ui/catalogwidget.cpp | 30 +++++++++++++++---- src/ui/catalogwidget.h | 26 +++++++++++++++- 6 files changed, 103 insertions(+), 7 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 13667e2af..60683c6e0 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,8 +4,9 @@ diagrams 1024 644 100 3 0 0 end show_stereotypes -selected artifact_ref 639914 // TableDataInterface +selected classrelation_ref 800810 // rootItem () open + class_ref 741802 // TreeModel artifact_ref 639914 // TableDataInterface end end diff --git a/src/Libs/L_UniversalModels/include/genericeventfilter.h b/src/Libs/L_UniversalModels/include/genericeventfilter.h index f45a2cd74..3af10a8b6 100644 --- a/src/Libs/L_UniversalModels/include/genericeventfilter.h +++ b/src/Libs/L_UniversalModels/include/genericeventfilter.h @@ -1,3 +1,26 @@ +// ************************************************************************* +// +// 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 diff --git a/src/Libs/L_UniversalModels/src/genericeventfilter.cpp b/src/Libs/L_UniversalModels/src/genericeventfilter.cpp index a53519def..deac66d62 100644 --- a/src/Libs/L_UniversalModels/src/genericeventfilter.cpp +++ b/src/Libs/L_UniversalModels/src/genericeventfilter.cpp @@ -1,3 +1,26 @@ +// ************************************************************************* +// +// 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) { diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index d2de6b719..865c8ef14 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1430,9 +1430,14 @@ bool BrowserNode::wrong_child_name(const QString & s, UmlCode type, // check unicity for (Q3ListViewItem * child = firstChild(); child; child = child->nextSibling()) + { + if(((BrowserNode *) child) != this) + return false; + if (!((BrowserNode *) child)->deletedp() && ((BrowserNode *) child)->same_name(s, type)) return TRUE; + } return FALSE; } diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index 17b84c795..6e1923944 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -1,3 +1,26 @@ +// ************************************************************************* +// +// 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" @@ -66,7 +89,7 @@ void CatalogWidget::Init(UmlWindow* window, BrowserView* view) connect(view, SIGNAL(selectionChanged(Q3ListViewItem *)), this, SLOT(OnUpdateVisitedView(Q3ListViewItem *))); - connect(ui->leVisitedSearch, SIGNAL(returnPressed()), this, SLOT(OnPerformVisitedFiltering())); + connect(ui->leVisitedSearch, SIGNAL(textChanged(QString)), this, SLOT(OnPerformVisitedFiltering(QString))); qRegisterMetaType>("QList"); connect(view, SIGNAL(marked_list(QList)), this, SLOT(OnUpdateMarkedView(QList))); @@ -102,9 +125,6 @@ void CatalogWidget::CleanupBeforeNewProject() rootFavouritesInterface->removeChildren(0,rootFavouritesInterface->childCount()); tmodFavourites->InsertRootItem(rootFavouritesInterface); } - - - } void CatalogWidget::StageSkipVisited() @@ -318,7 +338,7 @@ void CatalogWidget::OnFavouritesContextMenu(QPoint point) favouritesMenu->popup(ui->tvFavourites->mapToGlobal(point)); } -void CatalogWidget::OnPerformVisitedFiltering() +void CatalogWidget::OnPerformVisitedFiltering(QString) { PerformFiltering(expandedNodesVisited, ui->tvVisitedNodes, tmodVisited, rootVisitedInterface); } diff --git a/src/ui/catalogwidget.h b/src/ui/catalogwidget.h index 87f564eea..01038b949 100644 --- a/src/ui/catalogwidget.h +++ b/src/ui/catalogwidget.h @@ -1,3 +1,26 @@ +// ************************************************************************* +// +// 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 @@ -81,7 +104,8 @@ class CatalogWidget : public QWidget void PullNodeUpwardsInVisited(BrowserNode*); public slots: - void OnPerformVisitedFiltering(); + //void OnPerformVisitedFiltering(); + void OnPerformVisitedFiltering(QString); void OnPerformMarkedFiltering(); void OnPerformFavouritesFiltering(); void OnUpdateVisitedView(Q3ListViewItem * item); From 9b9e12bff8fe3f14f9b353d08cb4b9b43709e58f Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Feb 2013 21:52:44 +0400 Subject: [PATCH 021/297] this _really_ fixes relations name duplicate problem.... how I lost this commti I will never know --- src/Libs/L_UniversalModels/UML/models/42.session | 7 ++++--- src/browser/BrowserNode.cpp | 5 +---- src/data/RelationData.cpp | 2 ++ src/dialog/RelationDialog.cpp | 9 ++++++--- src/dialog/RelationDialog.h | 2 ++ src/misc/mystr.cpp | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 60683c6e0..11847a8c8 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -1,12 +1,13 @@ -window_sizes 1680 988 394 1281 806 104 +window_sizes 1680 988 628 1047 806 104 diagrams active classdiagram_ref 200490 // Adapting Table Model - 1024 644 100 3 0 0 + 830 644 100 3 0 0 end show_stereotypes -selected classrelation_ref 800810 // rootItem () +selected classrelation_ref 821290 // rootItem () open class_ref 741802 // TreeModel + class_ref 748458 // TableDataListHolder artifact_ref 639914 // TableDataInterface end end diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 865c8ef14..875aea731 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1372,7 +1372,7 @@ bool BrowserNode::enter_child_name(QString & r, const QString & msg, UmlCode typ } } -bool BrowserNode::wrong_child_name(const QString & s, UmlCode type, +bool BrowserNode::wrong_child_name( const QString & s, UmlCode type, bool allow_spaces, bool allow_empty) const { if (s.isEmpty()) @@ -1431,9 +1431,6 @@ bool BrowserNode::wrong_child_name(const QString & s, UmlCode type, for (Q3ListViewItem * child = firstChild(); child; child = child->nextSibling()) { - if(((BrowserNode *) child) != this) - return false; - if (!((BrowserNode *) child)->deletedp() && ((BrowserNode *) child)->same_name(s, type)) return TRUE; diff --git a/src/data/RelationData.cpp b/src/data/RelationData.cpp index 17d8f01ce..228ae7030 100644 --- a/src/data/RelationData.cpp +++ b/src/data/RelationData.cpp @@ -500,6 +500,8 @@ bool RelationData::decldefbody_contain(const QString & s, bool cs, 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)); diff --git a/src/dialog/RelationDialog.cpp b/src/dialog/RelationDialog.cpp index 28f5e7bce..9ff620954 100644 --- a/src/dialog/RelationDialog.cpp +++ b/src/dialog/RelationDialog.cpp @@ -252,6 +252,8 @@ RelationDialog::RelationDialog(RelationData * r) // role A bg = new Q3GroupBox(2, Qt::Horizontal, ina, split); 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); @@ -2649,10 +2651,11 @@ void RelationDialog::accept() QString ra = a.edrole->text().stripWhiteSpace(); QString rb = b.edrole->text().stripWhiteSpace(); - - if (rel->wrong_role_a_name(ra)) + 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 (rel->wrong_role_b_name(rb)) + 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(); diff --git a/src/dialog/RelationDialog.h b/src/dialog/RelationDialog.h index 3c176d0a5..1f9ee7252 100644 --- a/src/dialog/RelationDialog.h +++ b/src/dialog/RelationDialog.h @@ -151,6 +151,8 @@ class RelationDialog : public Q3TabDialog UmlCode current_type; QStringList list; BrowserNodeList nodes; + QString aOldText; + QString bOldText; Q3ComboBox * edassociation; QWidgetList groupb; Q3GroupBox * cpp_b; diff --git a/src/misc/mystr.cpp b/src/misc/mystr.cpp index 5c74342b4..02c6487c3 100644 --- a/src/misc/mystr.cpp +++ b/src/misc/mystr.cpp @@ -82,7 +82,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 ; } From 6bfcbe7c6af5b15279349a6fcf1f746dbfbfa961 Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 18 Feb 2013 14:44:22 +0400 Subject: [PATCH 022/297] some static data got in the way of saving project. Created a dummy to avoid the problem --- src/browser/BrowserNode.cpp | 18 ++++++++---------- src/browser/BrowserNode.h | 19 +++++++++++-------- src/browser/BrowserNodeDummy.cpp | 5 +++++ src/browser/BrowserNodeDummy.h | 22 ++++++++++++++++++++++ src/douml.pro | 6 ++++-- src/ui/catalogwidget.cpp | 5 +++-- 6 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 src/browser/BrowserNodeDummy.cpp create mode 100644 src/browser/BrowserNodeDummy.h diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 875aea731..d91aeb599 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -106,18 +106,14 @@ 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) + name(s) { viewptr = parent; } 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) + name(s) { // move it at end @@ -131,10 +127,12 @@ BrowserNode::BrowserNode(QString s, BrowserNode * parent) } BrowserNode::BrowserNode() - : Q3ListViewItem(UndefinedNodePackage, ""), - 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) + : Q3ListViewItem(UndefinedNodePackage, "") +{ +} + +BrowserNode::BrowserNode(Q3ListView * view) + : Q3ListViewItem(view, "") { } diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index daabe954c..c17a39665 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -77,14 +77,14 @@ class BrowserNode : public Q3ListViewItem, QString name; WrapperStr 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 + 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; @@ -102,6 +102,7 @@ class BrowserNode : public Q3ListViewItem, static BrowserView* viewptr; BrowserNode(); + BrowserNode(Q3ListView*); void set_parent(Q3ListViewItem * parent); virtual bool delete_internal(QString & warning); @@ -340,5 +341,7 @@ class BrowserNodeList : public Q3PtrList }; + + #endif 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..0dfccdf9f --- /dev/null +++ b/src/browser/BrowserNodeDummy.h @@ -0,0 +1,22 @@ +#ifndef BROWSERNODEDUMMY_H +#define BROWSERNODEDUMMY_H +#include "browser/BrowserNode.h" +class BrowserNodeDummy : public BrowserNode +{ +public: + BrowserNodeDummy(Q3ListView* view): BrowserNode(view){} + virtual ~BrowserNodeDummy(); + virtual BrowserNode * duplicate(BrowserNode * , + QString ){return 0;} + virtual void menu() {} + virtual void apply_shortcut(QString) {} + virtual UmlCode get_type() const{return UmlAssociation;} + virtual QString get_stype() const{return QString();} + virtual int get_identifier() const{return 0;} + virtual void save(QTextStream &, bool , QString & ){} + virtual BasicData * get_data() const {return 0;} + virtual void prepare_update_lib() const{}; + +}; + +#endif // BROWSERNODEDUMMY_H diff --git a/src/douml.pro b/src/douml.pro index 5dd52bdfc..54a48b514 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -233,7 +233,8 @@ HEADERS = \ tagmanagement/cpptagmanagement.h \ dialog/edgemenudialogqt4.h \ dialog/edgemenudialogbase.h \ - ui/catalogwidget.h + ui/catalogwidget.h \ + browser/BrowserNodeDummy.h SOURCES = \ @@ -513,7 +514,8 @@ SOURCES = \ dialog/edgemenudialogqt4.cpp \ dialog/edgemenudialogbase.cpp \ misc/codec.cpp \ - ui/catalogwidget.cpp + ui/catalogwidget.cpp \ + browser/BrowserNodeDummy.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index 6e1923944..cd2cef901 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -32,7 +32,8 @@ #include "Libs/L_UniversalModels/include/TreeItem.h" #include "Libs/L_UniversalModels/include/genericeventfilter.h" #include "diagram/BrowserView.h" -#include "browser/BrowserPackage.h" +//#include "browser/BrowserClassView.h" +#include "browser/BrowserNodeDummy.h" #include "diagram/UmlWindow.h" #include "misc/UmlDrag.h" #include "ClassData.h" @@ -157,7 +158,7 @@ void CatalogWidget::SetupTreeModel(TreeModel*& model , QTreeView* view, pointer->SetController(controller); pointer->addChildren(items); - data = QSharedPointer(new BrowserPackage(QString("hmm"), dummyView)); + data = QSharedPointer(new BrowserNodeDummy(dummyView)); pointer->SetInternalData(data.data()); controller->SetColumns(QStringList() << "class"); From fa93c75c2fea943df484c54c4efb916031fcbbab Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 18 Feb 2013 17:17:07 +0400 Subject: [PATCH 023/297] static members do not need initializers in header in c++ --- src/CppGenerator/UmlAttribute.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CppGenerator/UmlAttribute.cpp b/src/CppGenerator/UmlAttribute.cpp index f4ac9b3d6..cb34f3a49 100644 --- a/src/CppGenerator/UmlAttribute.cpp +++ b/src/CppGenerator/UmlAttribute.cpp @@ -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 << " = "; From 14011d656ad04af8e121dcceabdb6040c8e48315 Mon Sep 17 00:00:00 2001 From: zeks Date: Tue, 19 Feb 2013 23:55:59 +0400 Subject: [PATCH 024/297] FIX: enter/arrow buttons finished editing of key/value pairs. Fixed --- src/Libs/L_UniversalModels/UML/models/42.session | 5 +++-- src/dialog/KeyValueTable.cpp | 12 +++++++++++- src/dialog/KeyValueTable.h | 2 +- src/dialog/MLinesItem.cpp | 5 +++-- src/dialog/MLinesItem.h | 5 +++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 11847a8c8..7ef20fe3a 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -1,10 +1,11 @@ window_sizes 1680 988 628 1047 806 104 diagrams active classdiagram_ref 200490 // Adapting Table Model - 830 644 100 3 0 0 + 1047 806 100 3 0 0 end show_stereotypes -selected classrelation_ref 821290 // rootItem () +selected +package_ref 129 // models open class_ref 741802 // TreeModel class_ref 748458 // TableDataListHolder diff --git a/src/dialog/KeyValueTable.cpp b/src/dialog/KeyValueTable.cpp index 96635f5ff..a0e5f0e82 100644 --- a/src/dialog/KeyValueTable.cpp +++ b/src/dialog/KeyValueTable.cpp @@ -31,6 +31,8 @@ #include #include +#include +#include #include "KeyValueTable.h" #include "HaveKeyValueData.h" @@ -48,7 +50,6 @@ KeyValuesTable::KeyValuesTable(HaveKeyValueData * hv, QWidget * parent, bool isR { horizontalHeader()->setLabel(0, TR("Key")); horizontalHeader()->setLabel(1, TR("Value")); - if (!isReadOnly) horizontalHeader()->setLabel(2, TR("do")); @@ -134,6 +135,15 @@ void KeyValuesTable::init_row(int index) setRowStretchable(index, TRUE); } +bool KeyValuesTable::eventFilter(QObject *o, QEvent * e) +{ + if(e->type() == QEvent::KeyPress) + { + return false; + } + return Q3Table::eventFilter(o,e); +} + bool KeyValuesTable::check_unique() { forceUpdateCells(); diff --git a/src/dialog/KeyValueTable.h b/src/dialog/KeyValueTable.h index 9e5261fbf..7f2685ff6 100644 --- a/src/dialog/KeyValueTable.h +++ b/src/dialog/KeyValueTable.h @@ -39,7 +39,7 @@ class KeyValuesTable : public StringTable KeyValuesTable(HaveKeyValueData * h, QWidget * parent, bool visit); virtual void init_row(int index); - + bool eventFilter(QObject *o, QEvent *); bool check_unique(); void updateNodeFromThis(HaveKeyValueData * h); void updateThisFromNode(HaveKeyValueData * h, bool visit = false); diff --git a/src/dialog/MLinesItem.cpp b/src/dialog/MLinesItem.cpp index 8519f415d..6b187defa 100644 --- a/src/dialog/MLinesItem.cpp +++ b/src/dialog/MLinesItem.cpp @@ -33,6 +33,7 @@ #include "MLinesItem.h" #include +#include #include "DialogUtil.h" @@ -45,7 +46,7 @@ MLinesItem::MLinesItem(Q3Table * ta, const QString & s) QWidget * MLinesItem::createEditor() const { - ((MLinesItem *) this)->mle = new Q3TextEdit(table()->viewport()); + ((MLinesItem *) this)->mle = new QTextEdit(table()->viewport()); mle->setText(text()); return mle; } @@ -53,7 +54,7 @@ QWidget * MLinesItem::createEditor() const void MLinesItem::setContentFromEditor(QWidget * w) { - Q3TextEdit * editor = qobject_cast(w); + QTextEdit * editor = qobject_cast(w); if (editor) setText(editor->text()); diff --git a/src/dialog/MLinesItem.h b/src/dialog/MLinesItem.h index 1c94f949f..e1e78d2e6 100644 --- a/src/dialog/MLinesItem.h +++ b/src/dialog/MLinesItem.h @@ -30,12 +30,13 @@ #include "MyTable.h" -class Q3TextEdit; + +class QTextEdit; class MLinesItem : public TableItem { protected: - Q3TextEdit * mle; + QTextEdit * mle; public: MLinesItem(Q3Table * t, const QString & s); From bcd1cfd969743d7e3de16797cc153a89f2b4d487 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 23 Feb 2013 02:16:47 +0400 Subject: [PATCH 025/297] non-working commit rebuilding types table in generation settings to be a little more usable --- .../include/TableDataListHolder.h | 18 +- src/browser/BrowserNode.cpp | 9 +- src/dialog/GenerationSettingsBuiltinTable.cpp | 188 ++++++++++++++++++ src/dialog/GenerationSettingsBuiltinTable.h | 55 +++++ src/dialog/GenerationSettingsDialog.cpp | 176 +++++----------- src/dialog/GenerationSettingsDialog.h | 15 +- src/douml.pro | 6 +- src/icons.qrc | 1 + src/icons/bullet_add.png | Bin 0 -> 2205 bytes src/misc/GenerationSettings.cpp | 77 ++++--- src/misc/GenerationSettings.h | 11 +- 11 files changed, 363 insertions(+), 193 deletions(-) create mode 100644 src/dialog/GenerationSettingsBuiltinTable.cpp create mode 100644 src/dialog/GenerationSettingsBuiltinTable.h create mode 100644 src/icons/bullet_add.png diff --git a/src/Libs/L_UniversalModels/include/TableDataListHolder.h b/src/Libs/L_UniversalModels/include/TableDataListHolder.h index 21c39cf4e..692c07731 100644 --- a/src/Libs/L_UniversalModels/include/TableDataListHolder.h +++ b/src/Libs/L_UniversalModels/include/TableDataListHolder.h @@ -33,12 +33,12 @@ #include #include "ItemController.h" -#include "l_tree_controller_global.h" +//#include "l_tree_controller_global.h" -template -class TableDataListHolder : public TableDataInterface +template +class TableDataListHolder : public TableDataInterface { public: virtual QVariant GetValue(int row, int column, int role) const; @@ -49,7 +49,7 @@ class TableDataListHolder : public TableDataInterface void SetColumns(QStringList _columns); - void SetData(const QList & data); + void SetData(QList data); QList GetData() const; @@ -67,10 +67,10 @@ class TableDataListHolder : public TableDataInterface private: - QList m_data; + QList m_data; QHash, std::function > setters; QHash, std::function > getters; - QSharedPointer > controller; + QSharedPointer > controller; QStringList m_columns; int previousRowCount; @@ -81,7 +81,7 @@ QVariant TableDataListHolder::GetValue(int row, int column, int role) const // Bouml preserved body begin 0021352A if(!getters.contains(QPair(column, role))) return QVariant(); - QVariant ret = getters[QPair(column, role)](&m_data.at(row)); + QVariant ret = getters[QPair(column, role)](m_data.at(row)); return ret; // Bouml preserved body end 0021352A } @@ -92,7 +92,7 @@ void TableDataListHolder::SetValue(int row, int column, int role, const QVari // Bouml preserved body begin 002135AA if(setters.contains(QPair(column, role))) return; - setters[QPair(column, role)](&m_data[row], value); + setters[QPair(column, role)](m_data[row], value); // Bouml preserved body end 002135AA } @@ -113,7 +113,7 @@ void TableDataListHolder::SetColumns(QStringList _columns) } template -void TableDataListHolder::SetData(const QList & data) +void TableDataListHolder::SetData(QList data) { // Bouml preserved body begin 002136AA previousRowCount = m_data.size(); diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index d91aeb599..1e808e5db 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -941,8 +941,13 @@ 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) diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp new file mode 100644 index 000000000..37e6b4f06 --- /dev/null +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -0,0 +1,188 @@ +#include "GenerationSettingsBuiltinTable.h" +#include "GenerationSettings.h" +#include "Libs/L_UniversalModels/include/AdaptingTableModel.h" +#include +#include +#include +#include +#include +#include +#include +BuiltinTable::BuiltinTable(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) +{ +} + +BuiltinTable::~BuiltinTable() +{ +} + +void BuiltinTable::Init() +{ + InitInterface(); + CreateRowMenu(); + TableSetup(); + CreateConnections(); + +} + +void BuiltinTable::TableSetup() +{ + holder = new TableDataListHolder(); + + QList 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" << "do"); + + typetableInterface = QSharedPointer(dynamic_cast(holder)); + + typetableModel->SetInterface(typetableInterface); + + QSortFilterProxyModel* sortModel = new QSortFilterProxyModel(); + sortModel->setSourceModel(typetableModel); + types_table->setModel(sortModel); + types_table->setAlternatingRowColors(true); + types_table->setSortingEnabled(true); + types_table->resizeColumnToContents(0); + types_table->resizeColumnToContents(8); +} + +void BuiltinTable::InitInterface() +{ + QHBoxLayout* layControls = new QHBoxLayout; + pbAddNewType = new QPushButton(QIcon(":/root/icons/bullet_add.png"), "Add type"); + lblVisibility = new QLabel("Language visibility:"); + chkCpp = new QCheckBox("C++"); + chkJava = new QCheckBox("Java"); + chkIdl = new QCheckBox("Idl"); + layControls->addWidget(pbAddNewType); + 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(); + QAction* actInsertNewBefore = menuRow->addAction("Insert row before", this, SLOT(OnInsertNewRow())); + actInsertNewBefore->setData("before"); + QAction* actInsertNewAfter = menuRow->addAction("Insert row after", this, SLOT(OnInsertNewRow())); + actInsertNewAfter->setData("after"); + menuRow->addSeparator(); + menuRow->addAction("Copy row", this, SLOT(OnCopyRow())); + QAction* actPasteRowBefore = menuRow->addAction("Paste row before", this, SLOT(OnPasteRow())); + actPasteRowBefore->setData("before"); + QAction* actPasteRowAfter = menuRow->addAction("Paste row after", this, SLOT(OnPasteRow())); + actPasteRowAfter->setData("after"); + menuRow->addAction("Cut row", this, SLOT(OnCutRow())); + menuRow->addSeparator(); + menuRow->addAction("Delete row", this, SLOT(OnDeleteRow())); + } +} + +void BuiltinTable::CreateConnections() +{ + connect(types_table, SIGNAL(clicked(QModelIndex)), this, SLOT(OnCallRowMenu(QModelIndex))); +} + +void BuiltinTable::OnAddNewType() +{ +} + +void BuiltinTable::OnCppVisibilityToggled(bool) +{ +} + +void BuiltinTable::OnJavaVisibilityToggled(bool) +{ +} + +void BuiltinTable::OnIdlVisibilityToggled(bool) +{ +} + +void BuiltinTable::OnInsertNewRow() +{ +} + +void BuiltinTable::OnPasteRow() +{ +} + +void BuiltinTable::OnDeleteRow() +{ +} + +void BuiltinTable::OnCopyRow() +{ +} + +void BuiltinTable::OnCutRow() +{ +} + +#define ADD_STRING_GETSET(X,Y,Z) \ +X->AddGetter(QPair(Y,0), \ +[] (const Builtin* data) \ +{ \ + if(data) \ + return QVariant(data->Z); \ + else \ + return QVariant(); \ +} \ +); \ +X->AddSetter(QPair(Y,0), \ +[] (Builtin* data, QVariant value) \ +{ \ + if(data) \ + data->Z = value.toString(); \ +} \ +); \ + +void BuiltinTable::SetupAccess() +{ + ADD_STRING_GETSET(holder, 0, uml); + ADD_STRING_GETSET(holder, 1, cpp); + ADD_STRING_GETSET(holder, 2, java); + ADD_STRING_GETSET(holder, 3, idl); + ADD_STRING_GETSET(holder, 4, cpp_in); + ADD_STRING_GETSET(holder, 5, cpp_out); + ADD_STRING_GETSET(holder, 6, cpp_inout); + ADD_STRING_GETSET(holder, 7, cpp_return); + holder->AddGetter(QPair(8,0), + [] (const Builtin* ) + { + return QVariant(QString(" ")); + }); +} + + +void BuiltinTable::OnCallRowMenu(const QModelIndex & index) +{ + if(index.column() == 8) + menuRow->popup(QCursor::pos()); +} + + + diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h new file mode 100644 index 000000000..f6353693f --- /dev/null +++ b/src/dialog/GenerationSettingsBuiltinTable.h @@ -0,0 +1,55 @@ +#ifndef GENERATIONSETTINGSBUILTINTABLE_H +#define GENERATIONSETTINGSBUILTINTABLE_H +#include +class QTableView; +#include "Libs/L_UniversalModels/include/ItemController.h" +#include "Libs/L_UniversalModels/include/TableDataInterface.h" +#include "Libs/L_UniversalModels/include/TableDataListHolder.h" + +class AdaptingTableModel; +class Builtin; +class QCheckBox; +class QPushButton; +class QLabel; +class QMenu; +class BuiltinTable : public QWidget +{ + Q_OBJECT +public: + BuiltinTable(QWidget* parent = 0, Qt::WindowFlags f = 0); + virtual ~BuiltinTable(); + void Init(); + +private: + void SetupAccess(); + void TableSetup(); + void InitInterface(); + void CreateRowMenu(); + void CreateConnections(); + + QTableView* types_table = nullptr; + AdaptingTableModel* typetableModel = nullptr; + QSharedPointer typetableInterface; + TableDataListHolder* holder = nullptr; + QCheckBox* chkCpp = nullptr; + QCheckBox* chkJava = nullptr; + QCheckBox* chkIdl = nullptr; + QLabel* lblVisibility = nullptr; + QPushButton* pbAddNewType = nullptr; + QMenu* menuRow = nullptr; +public slots: + void OnAddNewType(); + void OnCppVisibilityToggled(bool); + void OnJavaVisibilityToggled(bool); + void OnIdlVisibilityToggled(bool); + + void OnInsertNewRow(); + void OnPasteRow(); + void OnDeleteRow(); + void OnCopyRow(); + void OnCutRow(); + void OnCallRowMenu(const QModelIndex&); + +}; + +#endif // GENERATIONSETTINGSBUILTINTABLE_H diff --git a/src/dialog/GenerationSettingsDialog.cpp b/src/dialog/GenerationSettingsDialog.cpp index 3bad7229f..2e7b32a9c 100644 --- a/src/dialog/GenerationSettingsDialog.cpp +++ b/src/dialog/GenerationSettingsDialog.cpp @@ -53,6 +53,11 @@ #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" + QSize GenerationSettingsDialog::previous_size; @@ -107,9 +112,8 @@ void GenerationSettingsDialog::init_types() grid->setSpacing(3); new QLabel(TR("Types correspondence, and C++ operation argument default passing for them :"), grid); - - types_table = new TypesTable(grid); - + builtinTable = new BuiltinTable(grid); + builtinTable->Init(); addTab(grid, TR("Types")); } @@ -1855,7 +1859,7 @@ static const char * get_indent(Q3ComboBox * cb) void GenerationSettingsDialog::accept() { - if (types_table->check()) { + if (/*types_table->check()*/true) { QString enum_in = cpp_enum_in->text().stripWhiteSpace(); QString enum_out = cpp_enum_out->text().stripWhiteSpace(); QString enum_inout = cpp_enum_inout->text().stripWhiteSpace(); @@ -1906,7 +1910,7 @@ void GenerationSettingsDialog::accept() return; } - types_table->update(); + //types_table->update(); relation_stereotypes_table->update(GenerationSettings::nrelattrstereotypes, GenerationSettings::relattr_stereotypes); class_stereotypes_table->update(GenerationSettings::nclassstereotypes, @@ -2332,126 +2336,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 = 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; +//} // StereotypesTable diff --git a/src/dialog/GenerationSettingsDialog.h b/src/dialog/GenerationSettingsDialog.h index 5b69cd091..a44854387 100644 --- a/src/dialog/GenerationSettingsDialog.h +++ b/src/dialog/GenerationSettingsDialog.h @@ -33,6 +33,7 @@ #include "VisibilityGroup.h" #include "StringTable.h" #include "GenerationSettings.h" +#include "GenerationSettingsBuiltinTable.h" class Q3ComboBox; class QCheckBox; @@ -45,6 +46,7 @@ class StereotypesTable; class RelationTable; class IncludeTable; + class GenerationSettingsDialog : public Q3TabDialog { Q_OBJECT @@ -52,7 +54,7 @@ class GenerationSettingsDialog : public Q3TabDialog protected: // all TypesTable * types_table; - + BuiltinTable* builtinTable; // stereotypes StereotypesTable * relation_stereotypes_table; StereotypesTable * class_stereotypes_table; @@ -281,17 +283,6 @@ 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 { protected: diff --git a/src/douml.pro b/src/douml.pro index 54a48b514..4aaf36718 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -234,7 +234,8 @@ HEADERS = \ dialog/edgemenudialogqt4.h \ dialog/edgemenudialogbase.h \ ui/catalogwidget.h \ - browser/BrowserNodeDummy.h + browser/BrowserNodeDummy.h \ + dialog/GenerationSettingsBuiltinTable.h SOURCES = \ @@ -515,7 +516,8 @@ SOURCES = \ dialog/edgemenudialogbase.cpp \ misc/codec.cpp \ ui/catalogwidget.cpp \ - browser/BrowserNodeDummy.cpp + browser/BrowserNodeDummy.cpp \ + dialog/GenerationSettingsBuiltinTable.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM diff --git a/src/icons.qrc b/src/icons.qrc index b69c3fdb5..52bc5d948 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -11,5 +11,6 @@ icons/reject.png icons/right.png icons/up.png + icons/bullet_add.png diff --git a/src/icons/bullet_add.png b/src/icons/bullet_add.png new file mode 100644 index 0000000000000000000000000000000000000000..1599f179209b1a7189d2192d083ed77967b2095d GIT binary patch literal 2205 zcmV;O2x9k%P)KE{hB9ID#4+{AxQY8pQBn?It zQ3)uGV&mY%k0kbZ?0MaJ&s^3%=lWIRG<Kk2kosEUg-NIhB#t{RhZdD)Po6JjrZcx+@FveJptT!8>kks=jAw# z`t;%PE-%Nc{t(WlCXkAx@J#1^AUO;~k{liC`)eC_G0h-;)Tra)W3Iag0D}mdK+RUa zUK)QMKka`Su_!kRcW5ri0-U-AkgTfTMq3KcMLY3adKN#g+Bi?3NDcz&Ilki2>wYW% znd5NrMh$2m#rL0l8Q<+W1Z0^CFBdV$h1Ud{4GpBh&CMX+Y3LLV90mG5fv*w3VLOep zOvhp+uiug958H1$$)W*nW@j+eIe|Z%_$J0{1#00IBkcwP5x&4TynfD=A&Frs>lM9H zgP)~!veeGV`25}tY^>bE)cjvCXN7m~wmSPT4RC_Jh9m96xO()fh^*bFkg`CmpQ4QG zC>$jqouZ~2wQMGz{-7TD2YPMx43M-J|-4_`uSO$mW{@s?|ho)f+0Ou%C}zC8%0w(H4i?-m;Ux9j+-G|Q5(L#TLXi`$8e-o z*X863y5%O3hg{)tu{r?-%yx_>K80Gdj=Q-JFw}M!VShvk6D>VYR+Uew3c20JGz>nY zf;+{Ez{2}GL>LgEbm3ee4xi8`R7;sDh5IxR$E8eiUT@myjXsHpzXN_x5PfZj;PZr$ zP3^qLIuUbcr)=X@JoV zhmtrbB_&9=HaGME(BMKjmr9fO`lBP5NFGO5cmj*X8?YN?yf}OwVKc^i`%!6T@y_iZ z;{Dt2AraOLh>&GX8kv0xe`l^s7*9@OK0A$K zEd$FN#=ht%*6c+%MCTDE8I-u7Ff51*YYO+40s2^GHBo-krC9`MxYSz|;XrJdDadg1 zC6)IGsScPC#QZ&|dTlyh4V|F_Txc2T(oMWO{}artUty_g>Xm>UoeC*S3UEBTgaO`F zrsSiKFVL|n#We)jQ0N!DuH||KOpB4`(aroeok1)WW~lfT1X!!-@@*^@uHl`zH_6r_ zPfLSBbqJ89M<&Y!cb$Mb;1sLeZ-koNw*|mz!&Tn6M095)XDn}Z>?#i+^6M*a<9=Zg zwN{y%EF)90aeC|(M%Y6}GPrNw#cF90ZDh`CIAlno($TUpff;a_XlZ8YvMXd{eY*-w z(0Fl~Vm?!^X&19RS_=WmSvijf_GPs|m5YwV2M}kut=RwOhF&E~NtNl{K5aP_&8F6X zN~f!V+!DQF71uVSSAv%lk3N0j!A;y_OQlXdvCeu)pME~F(8+S@U{1S2Vlr!tJV)i9 zM0aEotM(F1&$ef5R#DA0HR%hh70p0l1<1@}fm5nm4DkGy9w5(%zt=g53q**H5!OgS zSA&Eg3n^C=AyIU*nSaoRXQ+n{n4UBe0ax+RXNOp@q)>oJ?&W^1sLlgP&0BkRL=z`* zvHvN2k>|HG6Fhne#MWoL95S-Fhe}Ep1)PH@^KNMSrVVX4GK4vGa+WmZ zJpEMUAN~&4$?kDJE$jrat0N-vg*($YU(4(MQ2asKGRa@F>Yj*PxFUHiyDnGN_k?2V zRkMtMl&&b#T!g0R`+#&uTUEwRK{Wv=?g>jllBi0RnTQ^Mh z4u-rTejyu5|0g+@D&k+YWrF)LnYh4x#9KKFd9j4ezaAe2V7UGvpR55;W?+K`)&it` zIKd|;xuK5?c-g>sM4X~>iCipO>Rnuv7vbO%2VDhJ1Ex7 GenerationSettings::builtins; QStringList GenerationSettings::umltypes; bool GenerationSettings::cpp_default_defs; @@ -366,29 +366,31 @@ void GenerationSettings::read_declaration_defaults() void GenerationSettings::init() { - if (builtins != 0) - delete [] builtins; +// if (builtins != 0) +// delete [] builtins; nbuiltins = 15; - builtins = new Builtin[nbuiltins]; + //builtins = new Builtin[nbuiltins]; + + builtins.append(Builtin("void", "void", "void", "void")); + builtins.append(Builtin("any", "void *", "Object", "any")); - 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"); + + 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\ @@ -1644,23 +1646,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, @@ -2845,7 +2835,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); @@ -3650,19 +3641,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); @@ -3676,6 +3667,8 @@ void GenerationSettings::read(char *& st, char *& k) else b.cpp_return = "${type}"; + builtins.append(b); + umltypes.append(b.uml); } diff --git a/src/misc/GenerationSettings.h b/src/misc/GenerationSettings.h index 5e71149de..478e4dba6 100644 --- a/src/misc/GenerationSettings.h +++ b/src/misc/GenerationSettings.h @@ -44,6 +44,14 @@ 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; @@ -95,8 +103,9 @@ class GenerationSettings friend class StereotypesTable; protected: + friend class BuiltinTable; static int nbuiltins; - static Builtin * builtins; + static QList builtins; static QStringList umltypes; static bool cpp_default_defs; From c6111ffabfa14edb0b765eaa9e5a8f1697681127 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 23 Feb 2013 03:19:13 +0400 Subject: [PATCH 026/297] changin uml --- .../UML/models/200490.diagram | 4 +-- src/Libs/L_UniversalModels/UML/models/201002 | 26 +++++++++++++- .../src/AdaptingTableModel.cpp | 3 +- src/dialog/GenerationSettingsBuiltinTable.cpp | 35 +++++++++++++++++++ src/dialog/GenerationSettingsBuiltinTable.h | 9 +++++ 5 files changed, 73 insertions(+), 4 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/200490.diagram b/src/Libs/L_UniversalModels/UML/models/200490.diagram index 6fa063e2c..e3a323fe9 100644 --- a/src/Libs/L_UniversalModels/UML/models/200490.diagram +++ b/src/Libs/L_UniversalModels/UML/models/200490.diagram @@ -55,12 +55,12 @@ relationcanvas 132778 relation_ref 807466 // end relationcanvas 133034 relation_ref 807722 // from ref 132650 z 2012 to ref 128682 - role_a_pos 223 184 3000 no_role_b + role_a_pos 223 185 3000 no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133418 relation_ref 814250 // from ref 133290 z 2001 to ref 132394 - role_a_pos 136 348 3000 no_role_b + role_a_pos 140 348 3000 no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 133546 relation_ref 814378 // diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index 274f5fc5b..63f9e6af8 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 24 + revision 25 modified_by 42 "zeks" // class settings //class diagram settings @@ -1780,6 +1780,18 @@ Q_OBJECT end + operation 2248874 "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 + extra_member 189098 "signals" cpp " @@ -2064,6 +2076,18 @@ ${members}} end + operation 2249002 "InternalPointer" + 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 + attribute 1286314 "m_data" private explicit_type "QList" cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp index 70657ebf5..112f3905f 100644 --- a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp +++ b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp @@ -93,9 +93,10 @@ void AdaptingTableModel::SetInterface(QSharedPointer _interf QModelIndex AdaptingTableModel::index(int row, int column, const QModelIndex & parent) const { // Bouml preserved body begin 00213CAA + Q_D(AdaptingTableModel); if (!hasIndex(row, column, parent)) return QModelIndex(); - return createIndex(row, column); + return createIndex(row, column, d->interface); // Bouml preserved body end 00213CAA } diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index 37e6b4f06..f22eae506 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -8,6 +8,33 @@ #include #include #include +#include +static Builtin rowTemporary; + +static void InsertRow(QList& builtins, Builtin newRowValue, const Builtin& currentRowValue, AdaptingTableModel* model, QSharedPointer interface, ERowInsertMode insertMode) +{ + TableDataListHolder * holderPtr = static_cast* >(interface.data()); + + QList::Iterator it; + if(insertMode == ERowInsertMode::before_current || insertMode == ERowInsertMode::after_current) + { + it = std::find(builtins.begin(),builtins.end(), currentRowValue); + if(insertMode == ERowInsertMode::after_current) + it++; + } + else if(insertMode == ERowInsertMode::before_first) + { + it = builtins.begin(); + } + else + { + it = builtins.end() - 1; + } + builtins.insert(it,newRowValue); + model->SetInterface(interface); +} + + BuiltinTable::BuiltinTable(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f) { } @@ -124,6 +151,14 @@ void BuiltinTable::OnIdlVisibilityToggled(bool) void BuiltinTable::OnInsertNewRow() { + QAction* senderAction = dynamic_cast(sender()); + TableDataInterface* iFace = static_cast(types_table->currentIndex().internalPointer()); + Builtin* holderPtr = static_cast(iFace); + if(senderAction->data().toString() == "before") + InsertRow(GenerationSettings::builtins, Builtin(), *holderPtr, typetableModel, typetableInterface, ERowInsertMode::before_current); + else + InsertRow(GenerationSettings::builtins, Builtin(), *holderPtr, typetableModel, typetableInterface, ERowInsertMode::after_current); + } void BuiltinTable::OnPasteRow() diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h index f6353693f..6dc0608be 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.h +++ b/src/dialog/GenerationSettingsBuiltinTable.h @@ -12,6 +12,14 @@ class QCheckBox; class QPushButton; class QLabel; class QMenu; + +enum class ERowInsertMode +{ + before_first, + before_current, + after_last, + after_current +}; class BuiltinTable : public QWidget { Q_OBJECT @@ -24,6 +32,7 @@ class BuiltinTable : public QWidget void SetupAccess(); void TableSetup(); void InitInterface(); + void CreateRowMenu(); void CreateConnections(); From 69dbee1a1f1b5436ffaba73d423eed2d7c70d98e Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 23 Feb 2013 04:41:10 +0400 Subject: [PATCH 027/297] somwhate working --- src/Libs/L_UniversalModels/UML/models/201002 | 77 ++++++++++++++++--- .../L_UniversalModels/UML/models/42.session | 7 +- .../include/TableDataInterface.h | 4 + .../include/TableDataListHolder.h | 38 +++++++-- .../src/AdaptingTableModel.cpp | 6 +- .../src/TableDataInterface.cpp | 24 +----- src/dialog/GenerationSettingsBuiltinTable.cpp | 29 +++++-- src/dialog/GenerationSettingsBuiltinTable.h | 3 +- src/misc/GenerationSettings.h | 13 +++- 9 files changed, 148 insertions(+), 53 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index 63f9e6af8..ca3dc10cd 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 25 + revision 27 modified_by 42 "zeks" // class settings //class diagram settings @@ -28,9 +28,32 @@ format 75 cpp_h_dir "include/" cpp_src_dir "src/" - ncouples 2 + 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 @@ -1781,7 +1804,7 @@ Q_OBJECT end operation 2248874 "InternalPointer" - abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "void*" + 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}; @@ -1792,6 +1815,19 @@ Q_OBJECT 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 + extra_member 189098 "signals" cpp " @@ -1931,7 +1967,7 @@ ${members}} preserve_cpp_body_indent public explicit_return_type "void" nparams 1 - param in name "data" explicit_type "QList" + param in name "data" explicit_type "QList" 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} @@ -2077,10 +2113,31 @@ ${members}} end operation 2249002 "InternalPointer" - preserve_cpp_body_indent cpp_virtual public explicit_return_type "void*" + 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 @@ -2089,7 +2146,7 @@ ${members}} end attribute 1286314 "m_data" - private explicit_type "QList" + private explicit_type "QList" cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" java_decl " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; " @@ -2624,7 +2681,8 @@ ${namespace_end}" artifact 639914 "TableDataInterface" stereotype "source" - cpp_h "#ifndef ${NAMESPACE}_${NAME}_H + cpp_h "@{copyright} +#ifndef ${NAMESPACE}_${NAME}_H #define ${NAMESPACE}_${NAME}_H ${description} @@ -2653,12 +2711,13 @@ ${namespace_end}" artifact 640042 "TableDataListHolder" stereotype "source" - cpp_h "#ifndef ${NAMESPACE}_${NAME}_H + cpp_h "@{copyright} +#ifndef ${NAMESPACE}_${NAME}_H #define ${NAMESPACE}_${NAME}_H ${description} ${includes} -@{exportHeader} + @{loggingHeader} @{header} ${declarations} diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 7ef20fe3a..1d059d68e 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,11 +4,16 @@ diagrams 1047 806 100 3 0 0 end show_stereotypes +marked + class_ref 748458 // TableDataListHolder + class_ref 748330 // TableDataInterface +end selected package_ref 129 // models open class_ref 741802 // TreeModel + class_ref 748330 // TableDataInterface class_ref 748458 // TableDataListHolder - artifact_ref 639914 // TableDataInterface + deploymentview_ref 227626 // classes end end diff --git a/src/Libs/L_UniversalModels/include/TableDataInterface.h b/src/Libs/L_UniversalModels/include/TableDataInterface.h index 9c18ca323..fe46db8da 100644 --- a/src/Libs/L_UniversalModels/include/TableDataInterface.h +++ b/src/Libs/L_UniversalModels/include/TableDataInterface.h @@ -55,6 +55,10 @@ Q_OBJECT virtual int PreviousRowCount() = 0; + virtual void* InternalPointer() const = 0; + + virtual void* InternalPointer(int row) const = 0; + signals: void reloadData(); diff --git a/src/Libs/L_UniversalModels/include/TableDataListHolder.h b/src/Libs/L_UniversalModels/include/TableDataListHolder.h index 692c07731..67527972c 100644 --- a/src/Libs/L_UniversalModels/include/TableDataListHolder.h +++ b/src/Libs/L_UniversalModels/include/TableDataListHolder.h @@ -33,12 +33,12 @@ #include #include "ItemController.h" -//#include "l_tree_controller_global.h" -template -class TableDataListHolder : public TableDataInterface + +template +class TableDataListHolder : public TableDataInterface { public: virtual QVariant GetValue(int row, int column, int role) const; @@ -49,7 +49,7 @@ class TableDataListHolder : public TableDataInterface void SetColumns(QStringList _columns); - void SetData(QList data); + void SetData(const QList & data); QList GetData() const; @@ -65,15 +65,19 @@ class TableDataListHolder : public TableDataInterface virtual int PreviousRowCount(); + virtual void* InternalPointer() const; + + virtual void* InternalPointer(int row) const; + private: QList m_data; QHash, std::function > setters; QHash, std::function > getters; - QSharedPointer > controller; + QSharedPointer > controller; QStringList m_columns; - int previousRowCount; + int previousRowCount = 0; }; template QVariant TableDataListHolder::GetValue(int row, int column, int role) const @@ -113,7 +117,7 @@ void TableDataListHolder::SetColumns(QStringList _columns) } template -void TableDataListHolder::SetData(QList data) +void TableDataListHolder::SetData(const QList & data) { // Bouml preserved body begin 002136AA previousRowCount = m_data.size(); @@ -178,4 +182,24 @@ int TableDataListHolder::PreviousRowCount() // Bouml preserved body end 0022372A } +template +void* TableDataListHolder::InternalPointer() const +{ + // Bouml preserved body begin 0022512A + if(m_data.size() == 0) + return 0; + return m_data[0]; + // Bouml preserved body end 0022512A +} + +template +void* TableDataListHolder::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 +} + #endif diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp index 112f3905f..7b6da539f 100644 --- a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp +++ b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp @@ -93,10 +93,10 @@ void AdaptingTableModel::SetInterface(QSharedPointer _interf QModelIndex AdaptingTableModel::index(int row, int column, const QModelIndex & parent) const { // Bouml preserved body begin 00213CAA - Q_D(AdaptingTableModel); + Q_D(const AdaptingTableModel); if (!hasIndex(row, column, parent)) return QModelIndex(); - return createIndex(row, column, d->interface); + return createIndex(row, column, d->interface->InternalPointer(row)); // Bouml preserved body end 00213CAA } @@ -136,7 +136,7 @@ void AdaptingTableModel::OnReloadDataFromInterface() Q_D(AdaptingTableModel); reset(); - if(d->interface->PreviousRowCount() == 0) + if(d->interface->PreviousRowCount() != 0) { int removeLimit = d->interface->PreviousRowCount() == 0 ? 0 : d->interface->PreviousRowCount()- 1; beginRemoveRows(QModelIndex(), 0, removeLimit); diff --git a/src/Libs/L_UniversalModels/src/TableDataInterface.cpp b/src/Libs/L_UniversalModels/src/TableDataInterface.cpp index c86324414..4bae36160 100644 --- a/src/Libs/L_UniversalModels/src/TableDataInterface.cpp +++ b/src/Libs/L_UniversalModels/src/TableDataInterface.cpp @@ -1,26 +1,4 @@ -// ************************************************************************* -// -// 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/TableDataInterface.h" diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index f22eae506..26393d22c 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -9,16 +9,20 @@ #include #include #include +#include +//#include +//#include static Builtin rowTemporary; -static void InsertRow(QList& builtins, Builtin newRowValue, const Builtin& currentRowValue, AdaptingTableModel* model, QSharedPointer interface, ERowInsertMode insertMode) +static void InsertRow(QList& builtins, const Builtin& newRowValue, const Builtin& currentRowValue, AdaptingTableModel* model, QSharedPointer interface, ERowInsertMode insertMode) { - TableDataListHolder * holderPtr = static_cast* >(interface.data()); - + TableDataListHolder* holder = static_cast*>(interface.data()); QList::Iterator it; if(insertMode == ERowInsertMode::before_current || insertMode == ERowInsertMode::after_current) { - it = std::find(builtins.begin(),builtins.end(), currentRowValue); + using std::placeholders::_1; + std::function 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++; } @@ -31,6 +35,12 @@ static void InsertRow(QList& builtins, Builtin newRowValue, const Built it = builtins.end() - 1; } builtins.insert(it,newRowValue); + QList newBuiltins; + for(int i(0); i < builtins.size(); i++) + { + newBuiltins.append(&builtins[i]); + } + holder->SetData(newBuiltins); model->SetInterface(interface); } @@ -73,11 +83,11 @@ void BuiltinTable::TableSetup() typetableModel->SetInterface(typetableInterface); - QSortFilterProxyModel* sortModel = new QSortFilterProxyModel(); + sortModel = new QSortFilterProxyModel(); sortModel->setSourceModel(typetableModel); types_table->setModel(sortModel); types_table->setAlternatingRowColors(true); - types_table->setSortingEnabled(true); + //types_table->setSortingEnabled(true); types_table->resizeColumnToContents(0); types_table->resizeColumnToContents(8); } @@ -152,8 +162,11 @@ void BuiltinTable::OnIdlVisibilityToggled(bool) void BuiltinTable::OnInsertNewRow() { QAction* senderAction = dynamic_cast(sender()); - TableDataInterface* iFace = static_cast(types_table->currentIndex().internalPointer()); - Builtin* holderPtr = static_cast(iFace); + //TableDataInterface* iFace = static_cast(types_table->currentIndex().internalPointer()); + QModelIndex current = types_table->selectionModel()->currentIndex(); + current = sortModel->mapToSource(current); + Builtin* holderPtr = static_cast(current.internalPointer()); + if(senderAction->data().toString() == "before") InsertRow(GenerationSettings::builtins, Builtin(), *holderPtr, typetableModel, typetableInterface, ERowInsertMode::before_current); else diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h index 6dc0608be..9a549ce63 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.h +++ b/src/dialog/GenerationSettingsBuiltinTable.h @@ -12,7 +12,7 @@ class QCheckBox; class QPushButton; class QLabel; class QMenu; - +class QSortFilterProxyModel; enum class ERowInsertMode { before_first, @@ -37,6 +37,7 @@ class BuiltinTable : public QWidget void CreateConnections(); QTableView* types_table = nullptr; + QSortFilterProxyModel* sortModel; AdaptingTableModel* typetableModel = nullptr; QSharedPointer typetableInterface; TableDataListHolder* holder = nullptr; diff --git a/src/misc/GenerationSettings.h b/src/misc/GenerationSettings.h index 478e4dba6..e18e81956 100644 --- a/src/misc/GenerationSettings.h +++ b/src/misc/GenerationSettings.h @@ -52,6 +52,7 @@ class Builtin java = _java; idl = _idl; } + QString uml; QString cpp; QString java; @@ -63,7 +64,17 @@ class Builtin 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: From 5587f90729ff0d96f21080cdbf8e7bd66b33d234 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 23 Feb 2013 21:39:26 +0400 Subject: [PATCH 028/297] still working on types table --- src/Libs/L_UniversalModels/UML/models/201002 | 276 +++++++++++++++++- .../L_UniversalModels/UML/models/42.session | 10 +- .../L_UniversalModels/UML/models/models.prj | 2 +- .../include/AdaptingTableModel.h | 4 + .../include/TableDataInterface.h | 9 + .../include/TableDataListHolder.h | 85 +++++- .../src/AdaptingTableModel.cpp | 29 +- src/dialog/GenerationSettingsBuiltinTable.cpp | 140 ++++++++- src/dialog/GenerationSettingsBuiltinTable.h | 14 +- src/dialog/GenerationSettingsDialog.cpp | 8 +- src/dialog/GenerationSettingsDialog.h | 3 +- 11 files changed, 546 insertions(+), 34 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index ca3dc10cd..f660400da 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 27 + revision 30 modified_by 42 "zeks" // class settings //class diagram settings @@ -1556,6 +1556,39 @@ d_ptr(new AdaptingTableModelPrivate())" 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 extra_member 188842 "slots" @@ -1828,6 +1861,76 @@ Q_OBJECT 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" + 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 + extra_member 189098 "signals" cpp " @@ -1855,7 +1958,7 @@ signals: end class 748458 "TableDataListHolder" - visibility package + abstract visibility package nformals 1 formal name "T" type "class" explicit_default_value "" explicit_extends "" @@ -2018,6 +2121,32 @@ ${members}} end + operation 2277034 "get_flagsFunctors" + class_operation force_body_gen cpp_inline public explicit_return_type "QVector >" + 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 @@ -2143,6 +2272,122 @@ ${members}} 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" + 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 >" + 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" + 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" @@ -2204,6 +2449,27 @@ ${members}} python_decl "" idl_decl "" end + + attribute 1313834 "sortFunction" + private explicit_type "std::function" + 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 >" + 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" @@ -2649,7 +2915,8 @@ ${namespace_end}" artifact 633386 "AdaptingTableModel" stereotype "source" - cpp_h "#ifndef ${NAMESPACE}_${NAME}_H + cpp_h "@{copyright} +#ifndef ${NAMESPACE}_${NAME}_H #define ${NAMESPACE}_${NAME}_H ${description} @@ -2664,7 +2931,8 @@ ${definition} ${namespace_end} #endif " - cpp_src "${description} + cpp_src "@{copyright} +${description} @{meta} @{src} ${includes} diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 1d059d68e..87557d74c 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -9,11 +9,15 @@ marked class_ref 748330 // TableDataInterface end selected -package_ref 129 // models + package_ref 129 // models open - class_ref 741802 // TreeModel + class_ref 714666 // ItemController class_ref 748330 // TableDataInterface - class_ref 748458 // TableDataListHolder + operation_ref 2277034 // get_flagsFunctors + operation_ref 2276906 // flags + operation_ref 2276778 // AddFlagsFunctor + attribute_ref 1307306 // previousRowCount + attribute_ref 1320362 // flagsFunctors deploymentview_ref 227626 // classes end end diff --git a/src/Libs/L_UniversalModels/UML/models/models.prj b/src/Libs/L_UniversalModels/UML/models/models.prj index 0cc7751a7..7983eee94 100644 --- a/src/Libs/L_UniversalModels/UML/models/models.prj +++ b/src/Libs/L_UniversalModels/UML/models/models.prj @@ -1,6 +1,6 @@ format 75 "models" - revision 126 + revision 128 modified_by 42 "zeks" cpp_root_dir "E:\\Programming\\Douml\\src\\Libs\\L_UniversalModels\\" diff --git a/src/Libs/L_UniversalModels/include/AdaptingTableModel.h b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h index 08222a104..2b7d2684c 100644 --- a/src/Libs/L_UniversalModels/include/AdaptingTableModel.h +++ b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h @@ -64,6 +64,10 @@ Q_OBJECT QVariant headerData(int section, Qt::Orientation orientation, int role) const; + int RowForValue(void* value); + + void sort(); + public slots: void OnReloadDataFromInterface(); diff --git a/src/Libs/L_UniversalModels/include/TableDataInterface.h b/src/Libs/L_UniversalModels/include/TableDataInterface.h index fe46db8da..6e6aae68e 100644 --- a/src/Libs/L_UniversalModels/include/TableDataInterface.h +++ b/src/Libs/L_UniversalModels/include/TableDataInterface.h @@ -28,6 +28,7 @@ #include #include #include +#include #include "l_tree_controller_global.h" @@ -59,6 +60,14 @@ Q_OBJECT virtual void* InternalPointer(int row) const = 0; + virtual bool Equal(int row, void* data) = 0; + + virtual void SetSortFunction(std::function func) = 0; + + virtual void sort() = 0; + + virtual Qt::ItemFlags flags(const QModelIndex & index) const = 0; + signals: void reloadData(); diff --git a/src/Libs/L_UniversalModels/include/TableDataListHolder.h b/src/Libs/L_UniversalModels/include/TableDataListHolder.h index 67527972c..bbe431f5c 100644 --- a/src/Libs/L_UniversalModels/include/TableDataListHolder.h +++ b/src/Libs/L_UniversalModels/include/TableDataListHolder.h @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include #include "ItemController.h" @@ -55,6 +57,8 @@ class TableDataListHolder : public TableDataInterface QList& GetData(); + static inline QVector > GetFlagsFunctors(); + virtual int columnCount() const; virtual int rowCount() const; @@ -69,6 +73,18 @@ class TableDataListHolder : public TableDataInterface virtual void* InternalPointer(int row) const; + virtual bool Equal(int row, void* data); + + Qt::ItemFlags flags(const QModelIndex & index) const; + + virtual void sort(); + + static void AddFlagsFunctor(std::function functor); + + static void SetFlagsFunctors(QVector > value); + + virtual void SetSortFunction(std::function func); + private: QList m_data; @@ -78,6 +94,8 @@ class TableDataListHolder : public TableDataInterface QStringList m_columns; int previousRowCount = 0; + std::function sortFunction; + static QVector > flagsFunctors; }; template QVariant TableDataListHolder::GetValue(int row, int column, int role) const @@ -94,7 +112,7 @@ template void TableDataListHolder::SetValue(int row, int column, int role, const QVariant & value) { // Bouml preserved body begin 002135AA - if(setters.contains(QPair(column, role))) + if(!setters.contains(QPair(column, role))) return; setters[QPair(column, role)](m_data[row], value); // Bouml preserved body end 002135AA @@ -142,6 +160,13 @@ QList& TableDataListHolder::GetData() // Bouml preserved body end 0021E7AA } +template +inline QVector > TableDataListHolder::GetFlagsFunctors() + +{ + return flagsFunctors; +} + template int TableDataListHolder::columnCount() const { @@ -202,4 +227,62 @@ void* TableDataListHolder::InternalPointer(int row) const // Bouml preserved body end 00226AAA } +template +bool TableDataListHolder::Equal(int row, void* data) +{ + // Bouml preserved body begin 0022852A + T* value = static_cast(data); + if(*m_data[row] == *value) + return true; + return false; + // Bouml preserved body end 0022852A +} + +template +Qt::ItemFlags TableDataListHolder::flags(const QModelIndex & index) const +{ + // Bouml preserved body begin 0022BE2A + Qt::ItemFlags result; + for(auto func: flagsFunctors) + { + result |= func(index); + } + return result; + // Bouml preserved body end 0022BE2A +} + +template +void TableDataListHolder::sort() +{ + // Bouml preserved body begin 0022A42A + qSort(m_data.begin(), m_data.end(), sortFunction); + // Bouml preserved body end 0022A42A +} + +template +void TableDataListHolder::AddFlagsFunctor(std::function functor) + +{ + // Bouml preserved body begin 0022BDAA + flagsFunctors.append(functor); + // Bouml preserved body end 0022BDAA +} + +template +void TableDataListHolder::SetFlagsFunctors(QVector > value) + +{ + flagsFunctors = value; +} + +template +void TableDataListHolder::SetSortFunction(std::function func) +{ + // Bouml preserved body begin 0022A3AA + sortFunction = func; + // Bouml preserved body end 0022A3AA +} + +template +QVector > TableDataListHolder::flagsFunctors; #endif diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp index 7b6da539f..86c8fe9e1 100644 --- a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp +++ b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp @@ -23,6 +23,7 @@ // ************************************************************************* + #include "../include/AdaptingTableModel.h" #include "../include/TableDataInterface.h" #include "../include/AdaptingTableModelPrivate.h" @@ -103,15 +104,10 @@ QModelIndex AdaptingTableModel::index(int row, int column, const QModelIndex & p Qt::ItemFlags AdaptingTableModel::flags(const QModelIndex & index) const { // Bouml preserved body begin 002170AA + Q_D(const AdaptingTableModel); if (!index.isValid()) return 0; - - Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable; - - if ( index.column() == 0 ) - flags |= Qt::ItemIsUserCheckable; - - return flags; + return d->interface->flags(index); // Bouml preserved body end 002170AA } @@ -130,6 +126,25 @@ QVariant AdaptingTableModel::headerData(int section, Qt::Orientation orientation // 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::OnReloadDataFromInterface() { // Bouml preserved body begin 0021702A diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index 26393d22c..62505513e 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -6,14 +6,26 @@ #include #include #include +#include #include #include +#include +#include #include #include //#include //#include static Builtin rowTemporary; +//static bool SortBuiltinAscending(void* val1, void* val2) +//{ +// return static_cast(val1)->uml < static_cast(val2)->uml; +//} +//static bool SortBuiltinDescending(void* val1, void* val2) +//{ +// return static_cast(val1)->uml < static_cast(val2)->uml; +//} + static void InsertRow(QList& builtins, const Builtin& newRowValue, const Builtin& currentRowValue, AdaptingTableModel* model, QSharedPointer interface, ERowInsertMode insertMode) { TableDataListHolder* holder = static_cast*>(interface.data()); @@ -58,14 +70,54 @@ 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"), "Uml/Cpp/Java/Idl fields cannot be empty"); + return false; + } + QList& builtins = GenerationSettings::builtins; + std::function func = [&](const Builtin& val1){return val1.uml == value.uml;}; + int count = std::count_if(builtins.begin(), builtins.end(), func); + if(count > 1) + { + QMessageBox::critical(0, tr("Error"), "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"), "Cpp parameter controls must contain ${type}"); + return false; + } + } + return true; +} +void BuiltinTable::RollBack() +{ + GenerationSettings::builtins = rollbackBuiltins; } void BuiltinTable::TableSetup() { holder = new TableDataListHolder(); - + rollbackBuiltins = GenerationSettings::builtins; QList builtInList; for(int i(0); i < GenerationSettings::nbuiltins; i++) { @@ -85,9 +137,12 @@ void BuiltinTable::TableSetup() sortModel = new QSortFilterProxyModel(); sortModel->setSourceModel(typetableModel); + sortModel->setSortCaseSensitivity(Qt::CaseInsensitive); + types_table->setModel(sortModel); + types_table->setAlternatingRowColors(true); - //types_table->setSortingEnabled(true); + types_table->setSortingEnabled(true); types_table->resizeColumnToContents(0); types_table->resizeColumnToContents(8); } @@ -97,10 +152,25 @@ void BuiltinTable::InitInterface() QHBoxLayout* layControls = new QHBoxLayout; pbAddNewType = new QPushButton(QIcon(":/root/icons/bullet_add.png"), "Add type"); lblVisibility = new QLabel("Language visibility:"); + //lblSort = new QLabel("Sort order:"); chkCpp = new QCheckBox("C++"); + chkCpp->setChecked(true); chkJava = new QCheckBox("Java"); + chkJava->setChecked(true); chkIdl = new QCheckBox("Idl"); + chkIdl->setChecked(true); + lblSearch = new QLabel("Search:"); + leSearch = new QLineEdit(); +// cbSort = new QComboBox(); +// cbSort->addItem(tr("None")); +// cbSort->addItem(tr("Ascending")); +// cbSort->addItem(tr("Descending")); +// cbSort->setCurrentIndex(0); layControls->addWidget(pbAddNewType); + //layControls->addWidget(lblSort); + //layControls->addWidget(cbSort); + layControls->addWidget(lblSearch); + layControls->addWidget(leSearch); layControls->addWidget(lblVisibility); layControls->addWidget(chkCpp); layControls->addWidget(chkJava); @@ -141,6 +211,11 @@ void BuiltinTable::CreateRowMenu() 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))); + } void BuiltinTable::OnAddNewType() @@ -190,47 +265,82 @@ void BuiltinTable::OnCutRow() { } -#define ADD_STRING_GETSET(X,Y,Z) \ -X->AddGetter(QPair(Y,0), \ +#define ADD_STRING_GETSET(HOLDER,ROW,ROLE,PARAM) \ +HOLDER->AddGetter(QPair(ROW,ROLE), \ [] (const Builtin* data) \ { \ if(data) \ - return QVariant(data->Z); \ + return QVariant(data->PARAM); \ else \ return QVariant(); \ } \ ); \ -X->AddSetter(QPair(Y,0), \ +HOLDER->AddSetter(QPair(ROW,ROLE), \ [] (Builtin* data, QVariant value) \ { \ if(data) \ - data->Z = value.toString(); \ + data->PARAM = value.toString(); \ } \ ); \ void BuiltinTable::SetupAccess() { - ADD_STRING_GETSET(holder, 0, uml); - ADD_STRING_GETSET(holder, 1, cpp); - ADD_STRING_GETSET(holder, 2, java); - ADD_STRING_GETSET(holder, 3, idl); - ADD_STRING_GETSET(holder, 4, cpp_in); - ADD_STRING_GETSET(holder, 5, cpp_out); - ADD_STRING_GETSET(holder, 6, cpp_inout); - ADD_STRING_GETSET(holder, 7, cpp_return); + 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(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->setFilterRegExp(val); + sortModel->setDynamicSortFilter(true); +} + diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h index 9a549ce63..d10484a5e 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.h +++ b/src/dialog/GenerationSettingsBuiltinTable.h @@ -5,13 +5,16 @@ class QTableView; #include "Libs/L_UniversalModels/include/ItemController.h" #include "Libs/L_UniversalModels/include/TableDataInterface.h" #include "Libs/L_UniversalModels/include/TableDataListHolder.h" +#include "GenerationSettings.h" class AdaptingTableModel; -class Builtin; +//class Builtin; class QCheckBox; class QPushButton; class QLabel; class QMenu; +class QComboBox; +class QLineEdit; class QSortFilterProxyModel; enum class ERowInsertMode { @@ -27,6 +30,8 @@ class BuiltinTable : public QWidget BuiltinTable(QWidget* parent = 0, Qt::WindowFlags f = 0); virtual ~BuiltinTable(); void Init(); + bool ValidateTypes(); + void RollBack(); private: void SetupAccess(); @@ -44,9 +49,14 @@ class BuiltinTable : public QWidget 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 rollbackBuiltins; public slots: void OnAddNewType(); void OnCppVisibilityToggled(bool); @@ -59,6 +69,8 @@ public slots: void OnCopyRow(); void OnCutRow(); void OnCallRowMenu(const QModelIndex&); + void OnSetParameterVisibility(); + void OnFilterTable(QString); }; diff --git a/src/dialog/GenerationSettingsDialog.cpp b/src/dialog/GenerationSettingsDialog.cpp index 2e7b32a9c..4fcacd76a 100644 --- a/src/dialog/GenerationSettingsDialog.cpp +++ b/src/dialog/GenerationSettingsDialog.cpp @@ -1859,7 +1859,7 @@ static const char * get_indent(Q3ComboBox * cb) void GenerationSettingsDialog::accept() { - if (/*types_table->check()*/true) { + if (builtinTable->ValidateTypes()) { QString enum_in = cpp_enum_in->text().stripWhiteSpace(); QString enum_out = cpp_enum_out->text().stripWhiteSpace(); QString enum_inout = cpp_enum_inout->text().stripWhiteSpace(); @@ -2196,6 +2196,12 @@ void GenerationSettingsDialog::accept() } } +void GenerationSettingsDialog::reject() +{ + builtinTable->RollBack(); + QDialog::reject(); +} + void GenerationSettingsDialog::cpproot_browse() { QString dir = diff --git a/src/dialog/GenerationSettingsDialog.h b/src/dialog/GenerationSettingsDialog.h index a44854387..8b76b61b4 100644 --- a/src/dialog/GenerationSettingsDialog.h +++ b/src/dialog/GenerationSettingsDialog.h @@ -53,7 +53,7 @@ class GenerationSettingsDialog : public Q3TabDialog protected: // all - TypesTable * types_table; + //TypesTable * types_table; BuiltinTable* builtinTable; // stereotypes StereotypesTable * relation_stereotypes_table; @@ -257,6 +257,7 @@ class GenerationSettingsDialog : public Q3TabDialog protected slots: virtual void polish(); virtual void accept(); + virtual void reject(); void cpproot_browse(); void javaroot_browse(); void phproot_browse(); From 2f064b9980ab7ec867d2ab8e93dfa5bce739f9bc Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 23 Feb 2013 22:18:50 +0400 Subject: [PATCH 029/297] still working --- src/dialog/GenerationSettingsBuiltinTable.cpp | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index 62505513e..d58dd161f 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -198,10 +198,10 @@ void BuiltinTable::CreateRowMenu() actInsertNewAfter->setData("after"); menuRow->addSeparator(); menuRow->addAction("Copy row", this, SLOT(OnCopyRow())); - QAction* actPasteRowBefore = menuRow->addAction("Paste row before", this, SLOT(OnPasteRow())); - actPasteRowBefore->setData("before"); - QAction* actPasteRowAfter = menuRow->addAction("Paste row after", this, SLOT(OnPasteRow())); - actPasteRowAfter->setData("after"); + menuRow->addAction("Paste row", this, SLOT(OnPasteRow())); +// actPasteRowBefore->setData("before"); +// QAction* actPasteRowAfter = menuRow->addAction("Paste row after", this, SLOT(OnPasteRow())); +// actPasteRowAfter->setData("after"); menuRow->addAction("Cut row", this, SLOT(OnCutRow())); menuRow->addSeparator(); menuRow->addAction("Delete row", this, SLOT(OnDeleteRow())); @@ -251,14 +251,39 @@ void BuiltinTable::OnInsertNewRow() 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); + //typetableInterface-> + //Builtin* holderPtr = static_cast(current.internalPointer()); + + //std::function func = [&](const Builtin& val1){return val1 == *holderPtr;}; + //it = std::find_if(builtins.begin(),builtins.end(), std::bind(func, std::placeholders::_1)); + + } void BuiltinTable::OnCopyRow() { + QModelIndex current = types_table->selectionModel()->currentIndex(); + current = sortModel->mapToSource(current); + Builtin* holderPtr = static_cast(current.internalPointer()); + if(holderPtr) + rowTemporary = *holderPtr; } void BuiltinTable::OnCutRow() From 5f1db1601065346c890dc78430bf86e85398b41c Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 01:12:46 +0400 Subject: [PATCH 030/297] types table more or less working. Now only need to think how to generalize it better Some problem arises on repeated class dialog invocation --- src/Libs/L_UniversalModels/UML/models/201002 | 53 +++++++++++++++- .../L_UniversalModels/UML/models/42.session | 6 +- .../include/AdaptingTableModel.h | 2 + .../include/TableDataInterface.h | 2 + .../include/TableDataListHolder.h | 18 ++++-- .../src/AdaptingTableModel.cpp | 17 +++++- src/data/ClassData.cpp | 1 + src/dialog/ClassDialog.cpp | 2 + src/dialog/DialogUtil.cpp | 3 +- src/dialog/GenerationSettingsBuiltinTable.cpp | 61 ++++++++++++++----- src/dialog/GenerationSettingsBuiltinTable.h | 2 + src/dialog/GenerationSettingsDialog.cpp | 11 +++- src/dialog/GenerationSettingsDialog.h | 1 + src/misc/GenerationSettings.cpp | 2 + src/misc/GenerationSettings.h | 14 ++--- src/ui/catalogwidget.cpp | 3 +- 16 files changed, 163 insertions(+), 35 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index f660400da..1bce559ab 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 30 + revision 31 modified_by 42 "zeks" // class settings //class diagram settings @@ -1589,6 +1589,23 @@ d_ptr(new AdaptingTableModelPrivate())" + 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" @@ -1929,6 +1946,23 @@ Q_OBJECT 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" @@ -2388,6 +2422,23 @@ ${members}} + 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" diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 87557d74c..a9a2dee2c 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -6,13 +6,11 @@ end show_stereotypes marked class_ref 748458 // TableDataListHolder - class_ref 748330 // TableDataInterface end selected - package_ref 129 // models +package_ref 129 // models open - class_ref 714666 // ItemController - class_ref 748330 // TableDataInterface + extra_member_ref 188970 // object operation_ref 2277034 // get_flagsFunctors operation_ref 2276906 // flags operation_ref 2276778 // AddFlagsFunctor diff --git a/src/Libs/L_UniversalModels/include/AdaptingTableModel.h b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h index 2b7d2684c..6e837cac5 100644 --- a/src/Libs/L_UniversalModels/include/AdaptingTableModel.h +++ b/src/Libs/L_UniversalModels/include/AdaptingTableModel.h @@ -68,6 +68,8 @@ Q_OBJECT void sort(); + void RemoveRow(const QModelIndex & index); + public slots: void OnReloadDataFromInterface(); diff --git a/src/Libs/L_UniversalModels/include/TableDataInterface.h b/src/Libs/L_UniversalModels/include/TableDataInterface.h index 6e6aae68e..e2bca9e57 100644 --- a/src/Libs/L_UniversalModels/include/TableDataInterface.h +++ b/src/Libs/L_UniversalModels/include/TableDataInterface.h @@ -68,6 +68,8 @@ Q_OBJECT virtual Qt::ItemFlags flags(const QModelIndex & index) const = 0; + virtual void RemoveRow(int index) = 0; + signals: void reloadData(); diff --git a/src/Libs/L_UniversalModels/include/TableDataListHolder.h b/src/Libs/L_UniversalModels/include/TableDataListHolder.h index bbe431f5c..3046ef324 100644 --- a/src/Libs/L_UniversalModels/include/TableDataListHolder.h +++ b/src/Libs/L_UniversalModels/include/TableDataListHolder.h @@ -53,9 +53,9 @@ class TableDataListHolder : public TableDataInterface void SetData(const QList & data); - QList GetData() const; + QList GetData() const; - QList& GetData(); + QList& GetData(); static inline QVector > GetFlagsFunctors(); @@ -85,6 +85,8 @@ class TableDataListHolder : public TableDataInterface virtual void SetSortFunction(std::function func); + virtual void RemoveRow(int index); + private: QList m_data; @@ -145,7 +147,7 @@ void TableDataListHolder::SetData(const QList & data) } template -QList TableDataListHolder::GetData() const +QList TableDataListHolder::GetData() const { // Bouml preserved body begin 00218C2A return m_data; @@ -153,7 +155,7 @@ QList TableDataListHolder::GetData() const } template -QList& TableDataListHolder::GetData() +QList& TableDataListHolder::GetData() { // Bouml preserved body begin 0021E7AA return m_data; @@ -283,6 +285,14 @@ void TableDataListHolder::SetSortFunction(std::function f // Bouml preserved body end 0022A3AA } +template +void TableDataListHolder::RemoveRow(int index) +{ + // Bouml preserved body begin 0022DA2A + m_data.remove(m_data.begin()+index); + // Bouml preserved body end 0022DA2A +} + template QVector > TableDataListHolder::flagsFunctors; #endif diff --git a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp index 86c8fe9e1..3a419aef0 100644 --- a/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp +++ b/src/Libs/L_UniversalModels/src/AdaptingTableModel.cpp @@ -87,6 +87,7 @@ void AdaptingTableModel::SetInterface(QSharedPointer _interf 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 } @@ -117,6 +118,8 @@ QVariant AdaptingTableModel::headerData(int section, Qt::Orientation orientation 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); @@ -145,6 +148,18 @@ void AdaptingTableModel::sort() // 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 @@ -153,7 +168,7 @@ void AdaptingTableModel::OnReloadDataFromInterface() if(d->interface->PreviousRowCount() != 0) { - int removeLimit = d->interface->PreviousRowCount() == 0 ? 0 : d->interface->PreviousRowCount()- 1; + int removeLimit = d->interface->PreviousRowCount() == 0 ? 0 : d->interface->PreviousRowCount(); beginRemoveRows(QModelIndex(), 0, removeLimit); endRemoveRows(); } diff --git a/src/data/ClassData.cpp b/src/data/ClassData.cpp index a28199e0e..c3fa027fb 100644 --- a/src/data/ClassData.cpp +++ b/src/data/ClassData.cpp @@ -857,6 +857,7 @@ void ClassData::edit() // edition must be modal //An factory; ClassDialog::Instance(this)->show(); + ClassDialog::Instance(this)->raise(); //dialog->setModal(false); //QObject::connect(dialog.data(), SIGNAL(edgeMenuRequested(uint)),factory.getData(), SLOT(OnEdgeMenuRequested(uint))); //dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp index 0953a529f..897def8c2 100644 --- a/src/dialog/ClassDialog.cpp +++ b/src/dialog/ClassDialog.cpp @@ -88,6 +88,7 @@ ClassDialog::ClassDialog(ClassData * c): EdgeMenuDialog(0, 0, FALSE), cl(c) SetCurrentNode(c->browser_node); InitGui(); FillGuiElements(c); + //open_dialog(this); } void ClassDialog::polish() @@ -3067,6 +3068,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl) formals_table->update(cl, inh); // instantiate tab + //todo actuals_table->update(cl, inh); if (cl->get_n_actualparams() != 0) diff --git a/src/dialog/DialogUtil.cpp b/src/dialog/DialogUtil.cpp index d958e39cb..c022e7d62 100644 --- a/src/dialog/DialogUtil.cpp +++ b/src/dialog/DialogUtil.cpp @@ -721,7 +721,8 @@ static QWidgetList NonModalDialogs; void open_dialog(QWidget * w) { - NonModalDialogs.append(w); + if(!NonModalDialogs.contains(w)) + NonModalDialogs.append(w); } diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index d58dd161f..3a882203c 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include //#include @@ -53,7 +55,7 @@ static void InsertRow(QList& builtins, const Builtin& newRowValue, cons newBuiltins.append(&builtins[i]); } holder->SetData(newBuiltins); - model->SetInterface(interface); + //model->SetInterface(interface); } @@ -114,6 +116,31 @@ void BuiltinTable::RollBack() GenerationSettings::builtins = rollbackBuiltins; } +QList BuiltinTable::GetBuiltins() +{ + QList result; + QList 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;// = types_table->horizontalHeader()->width(); + 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(); @@ -182,6 +209,7 @@ void BuiltinTable::InitInterface() layMain->addLayout(layControls); layMain->addWidget(types_table); layMain->setContentsMargins(0,0,0,0); + this->setLayout(layMain); @@ -192,10 +220,10 @@ void BuiltinTable::CreateRowMenu() if(!menuRow) { menuRow = new QMenu(); - QAction* actInsertNewBefore = menuRow->addAction("Insert row before", this, SLOT(OnInsertNewRow())); - actInsertNewBefore->setData("before"); - QAction* actInsertNewAfter = menuRow->addAction("Insert row after", this, SLOT(OnInsertNewRow())); - actInsertNewAfter->setData("after"); +// QAction* actInsertNewBefore = menuRow->addAction("Insert row before", this, SLOT(OnInsertNewRow())); +// actInsertNewBefore->setData("before"); +// QAction* actInsertNewAfter = menuRow->addAction("Insert row after", this, SLOT(OnInsertNewRow())); +// actInsertNewAfter->setData("after"); menuRow->addSeparator(); menuRow->addAction("Copy row", this, SLOT(OnCopyRow())); menuRow->addAction("Paste row", this, SLOT(OnPasteRow())); @@ -215,6 +243,7 @@ void BuiltinTable::CreateConnections() 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())); } @@ -236,16 +265,16 @@ void BuiltinTable::OnIdlVisibilityToggled(bool) void BuiltinTable::OnInsertNewRow() { - QAction* senderAction = dynamic_cast(sender()); + //QAction* senderAction = dynamic_cast(sender()); //TableDataInterface* iFace = static_cast(types_table->currentIndex().internalPointer()); - QModelIndex current = types_table->selectionModel()->currentIndex(); - current = sortModel->mapToSource(current); - Builtin* holderPtr = static_cast(current.internalPointer()); + //QModelIndex current = types_table->selectionModel()->currentIndex(); + //current = sortModel->mapToSource(current); + //Builtin* holderPtr = static_cast(current.internalPointer()); - if(senderAction->data().toString() == "before") - InsertRow(GenerationSettings::builtins, Builtin(), *holderPtr, typetableModel, typetableInterface, ERowInsertMode::before_current); - else - InsertRow(GenerationSettings::builtins, Builtin(), *holderPtr, typetableModel, typetableInterface, ERowInsertMode::after_current); + //if(senderAction->data().toString() == "before") + InsertRow(GenerationSettings::builtins, Builtin(), Builtin(), typetableModel, typetableInterface, ERowInsertMode::after_last); +// else +// InsertRow(GenerationSettings::builtins, Builtin(), *holderPtr, typetableModel, typetableInterface, ERowInsertMode::after_current); } @@ -268,6 +297,7 @@ void BuiltinTable::OnDeleteRow() { QModelIndex current = types_table->selectionModel()->currentIndex(); current = sortModel->mapToSource(current); + typetableModel->RemoveRow(current); //typetableInterface-> //Builtin* holderPtr = static_cast(current.internalPointer()); @@ -288,6 +318,8 @@ void BuiltinTable::OnCopyRow() void BuiltinTable::OnCutRow() { + OnCopyRow(); + OnDeleteRow(); } #define ADD_STRING_GETSET(HOLDER,ROW,ROLE,PARAM) \ @@ -363,8 +395,9 @@ void BuiltinTable::OnSetParameterVisibility() void BuiltinTable::OnFilterTable(QString val) { + sortModel->setFilterCaseSensitivity(Qt::CaseInsensitive); sortModel->setFilterRegExp(val); - sortModel->setDynamicSortFilter(true); + //sortModel->setDynamicSortFilter(true); } diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h index d10484a5e..77dbf9f4e 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.h +++ b/src/dialog/GenerationSettingsBuiltinTable.h @@ -32,6 +32,8 @@ class BuiltinTable : public QWidget void Init(); bool ValidateTypes(); void RollBack(); + QList GetBuiltins(); + QSize GetOptimalSize(); private: void SetupAccess(); diff --git a/src/dialog/GenerationSettingsDialog.cpp b/src/dialog/GenerationSettingsDialog.cpp index 4fcacd76a..dc3df9fd6 100644 --- a/src/dialog/GenerationSettingsDialog.cpp +++ b/src/dialog/GenerationSettingsDialog.cpp @@ -42,6 +42,7 @@ #include #include #include +#include //Added by qt3to4: @@ -91,6 +92,7 @@ GenerationSettingsDialog::GenerationSettingsDialog() init_idl5(); init_descriptions(); init_dirs(); + } void GenerationSettingsDialog::polish() @@ -114,6 +116,7 @@ void GenerationSettingsDialog::init_types() new QLabel(TR("Types correspondence, and C++ operation argument default passing for them :"), grid); builtinTable = new BuiltinTable(grid); builtinTable->Init(); + this->resize(builtinTable->GetOptimalSize()); addTab(grid, TR("Types")); } @@ -123,7 +126,7 @@ void GenerationSettingsDialog::init_stereotypes() grid->setMargin(3); grid->setSpacing(3); - + this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); new QLabel(TR("Attributes and \nRelations\nstereotypes \ncorrespondence : "), grid); relation_stereotypes_table = new StereotypesTable(grid, GenerationSettings::nrelattrstereotypes, @@ -1859,7 +1862,10 @@ static const char * get_indent(Q3ComboBox * cb) void GenerationSettingsDialog::accept() { - if (builtinTable->ValidateTypes()) { + if (builtinTable->ValidateTypes()) + { + GenerationSettings::builtins = builtinTable->GetBuiltins(); + GenerationSettings::nbuiltins = GenerationSettings::builtins.size(); QString enum_in = cpp_enum_in->text().stripWhiteSpace(); QString enum_out = cpp_enum_out->text().stripWhiteSpace(); QString enum_inout = cpp_enum_inout->text().stripWhiteSpace(); @@ -2570,3 +2576,4 @@ void IncludeTable::update() } } } + diff --git a/src/dialog/GenerationSettingsDialog.h b/src/dialog/GenerationSettingsDialog.h index 8b76b61b4..20652570d 100644 --- a/src/dialog/GenerationSettingsDialog.h +++ b/src/dialog/GenerationSettingsDialog.h @@ -227,6 +227,7 @@ class GenerationSettingsDialog : public Q3TabDialog GenerationSettingsDialog(); virtual ~GenerationSettingsDialog(); + protected: void init_types(); void init_stereotypes(); diff --git a/src/misc/GenerationSettings.cpp b/src/misc/GenerationSettings.cpp index 2e51a72ed..27e45d566 100644 --- a/src/misc/GenerationSettings.cpp +++ b/src/misc/GenerationSettings.cpp @@ -1092,6 +1092,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); } diff --git a/src/misc/GenerationSettings.h b/src/misc/GenerationSettings.h index e18e81956..5aa166864 100644 --- a/src/misc/GenerationSettings.h +++ b/src/misc/GenerationSettings.h @@ -54,13 +54,13 @@ class Builtin } 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); }; diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index cd2cef901..865160800 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -374,7 +374,7 @@ void CatalogWidget::OnUpdateVisitedView(Q3ListViewItem * item) { if(UseSkipVisited()) return; - + this->ui->tabWidget->setCurrentWidget(this->ui->tabVisited); BrowserNode* itemAsNode = static_cast(item); itemAsNode = itemAsNode->get_first_generatable_node(); @@ -383,6 +383,7 @@ void CatalogWidget::OnUpdateVisitedView(Q3ListViewItem * item) void CatalogWidget::OnUpdateMarkedView(QList markedItems) { + this->ui->tabWidget->setCurrentWidget(this->ui->tabMarked); if(rootMarkedInterface.isNull()) return; QList > items; From 4b094bb8f6e36c52d1ef04c47e334116c9a7d79a Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 01:30:52 +0400 Subject: [PATCH 031/297] cleaned up a bit and added tr's for type form --- src/dialog/GenerationSettingsBuiltinTable.cpp | 90 +++---------------- src/dialog/GenerationSettingsBuiltinTable.h | 9 +- src/dialog/GenerationSettingsDialog.h | 2 - 3 files changed, 15 insertions(+), 86 deletions(-) diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index 3a882203c..bdd4ac1df 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -14,21 +14,8 @@ #include #include #include -#include -//#include -//#include static Builtin rowTemporary; - -//static bool SortBuiltinAscending(void* val1, void* val2) -//{ -// return static_cast(val1)->uml < static_cast(val2)->uml; -//} -//static bool SortBuiltinDescending(void* val1, void* val2) -//{ -// return static_cast(val1)->uml < static_cast(val2)->uml; -//} - -static void InsertRow(QList& builtins, const Builtin& newRowValue, const Builtin& currentRowValue, AdaptingTableModel* model, QSharedPointer interface, ERowInsertMode insertMode) +static void InsertRow(QList& builtins, const Builtin& newRowValue, const Builtin& currentRowValue, QSharedPointer interface, ERowInsertMode insertMode) { TableDataListHolder* holder = static_cast*>(interface.data()); QList::Iterator it; @@ -55,7 +42,6 @@ static void InsertRow(QList& builtins, const Builtin& newRowValue, cons newBuiltins.append(&builtins[i]); } holder->SetData(newBuiltins); - //model->SetInterface(interface); } @@ -87,7 +73,7 @@ bool BuiltinTable::ValidateTypes() value.java.trimmed().isEmpty() || value.idl.trimmed().isEmpty() ) { - QMessageBox::critical(0, tr("Error"), "Uml/Cpp/Java/Idl fields cannot be empty"); + QMessageBox::critical(0, tr("Error"), tr("Uml/Cpp/Java/Idl fields cannot be empty")); return false; } QList& builtins = GenerationSettings::builtins; @@ -95,7 +81,7 @@ bool BuiltinTable::ValidateTypes() int count = std::count_if(builtins.begin(), builtins.end(), func); if(count > 1) { - QMessageBox::critical(0, tr("Error"), "Duplicate Uml entries are not allowed"); + QMessageBox::critical(0, tr("Error"), tr("Duplicate Uml entries are not allowed")); return false; } if(!value.cpp_in.contains("${type}") || @@ -104,7 +90,7 @@ bool BuiltinTable::ValidateTypes() !value.cpp_out.contains("${type}") || !value.cpp_return.contains("${type}")) { - QMessageBox::critical(0, tr("Error"), "Cpp parameter controls must contain ${type}"); + QMessageBox::critical(0, tr("Error"), tr("Cpp parameter controls must contain ${type}")); return false; } } @@ -131,7 +117,7 @@ QList BuiltinTable::GetBuiltins() QSize BuiltinTable::GetOptimalSize() { QRect rect = types_table->geometry(); - int horizontalWidgth = 0;// = types_table->horizontalHeader()->width(); + int horizontalWidgth = 0; for(int i(0); i < types_table->horizontalHeader()->count(); i++) { if(!types_table->horizontalHeader()->isSectionHidden(i)) @@ -156,7 +142,7 @@ void BuiltinTable::TableSetup() SetupAccess(); holder->SetData(builtInList); - holder->SetColumns(QStringList() << "Uml" << "Cpp" << "Java" << "Idl" << "cpp_in" << "cpp_out" << "cpp_inout" << "cpp_return" << "do"); + holder->SetColumns(QStringList() << "Uml" << "Cpp" << "Java" << "Idl" << "cpp_in" << "cpp_out" << "cpp_inout" << "cpp_return" << tr("do")); typetableInterface = QSharedPointer(dynamic_cast(holder)); @@ -177,25 +163,17 @@ void BuiltinTable::TableSetup() void BuiltinTable::InitInterface() { QHBoxLayout* layControls = new QHBoxLayout; - pbAddNewType = new QPushButton(QIcon(":/root/icons/bullet_add.png"), "Add type"); - lblVisibility = new QLabel("Language visibility:"); - //lblSort = new QLabel("Sort order:"); + 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("Search:"); + lblSearch = new QLabel(tr("Search:")); leSearch = new QLineEdit(); -// cbSort = new QComboBox(); -// cbSort->addItem(tr("None")); -// cbSort->addItem(tr("Ascending")); -// cbSort->addItem(tr("Descending")); -// cbSort->setCurrentIndex(0); layControls->addWidget(pbAddNewType); - //layControls->addWidget(lblSort); - //layControls->addWidget(cbSort); layControls->addWidget(lblSearch); layControls->addWidget(leSearch); layControls->addWidget(lblVisibility); @@ -220,19 +198,12 @@ void BuiltinTable::CreateRowMenu() if(!menuRow) { menuRow = new QMenu(); -// QAction* actInsertNewBefore = menuRow->addAction("Insert row before", this, SLOT(OnInsertNewRow())); -// actInsertNewBefore->setData("before"); -// QAction* actInsertNewAfter = menuRow->addAction("Insert row after", this, SLOT(OnInsertNewRow())); -// actInsertNewAfter->setData("after"); menuRow->addSeparator(); - menuRow->addAction("Copy row", this, SLOT(OnCopyRow())); - menuRow->addAction("Paste row", this, SLOT(OnPasteRow())); -// actPasteRowBefore->setData("before"); -// QAction* actPasteRowAfter = menuRow->addAction("Paste row after", this, SLOT(OnPasteRow())); -// actPasteRowAfter->setData("after"); - menuRow->addAction("Cut row", this, SLOT(OnCutRow())); + 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("Delete row", this, SLOT(OnDeleteRow())); + menuRow->addAction(tr("Delete row"), this, SLOT(OnDeleteRow())); } } @@ -247,35 +218,10 @@ void BuiltinTable::CreateConnections() } -void BuiltinTable::OnAddNewType() -{ -} - -void BuiltinTable::OnCppVisibilityToggled(bool) -{ -} - -void BuiltinTable::OnJavaVisibilityToggled(bool) -{ -} - -void BuiltinTable::OnIdlVisibilityToggled(bool) -{ -} void BuiltinTable::OnInsertNewRow() { - //QAction* senderAction = dynamic_cast(sender()); - //TableDataInterface* iFace = static_cast(types_table->currentIndex().internalPointer()); - //QModelIndex current = types_table->selectionModel()->currentIndex(); - //current = sortModel->mapToSource(current); - //Builtin* holderPtr = static_cast(current.internalPointer()); - - //if(senderAction->data().toString() == "before") - InsertRow(GenerationSettings::builtins, Builtin(), Builtin(), typetableModel, typetableInterface, ERowInsertMode::after_last); -// else -// InsertRow(GenerationSettings::builtins, Builtin(), *holderPtr, typetableModel, typetableInterface, ERowInsertMode::after_current); - + InsertRow(GenerationSettings::builtins, Builtin(), Builtin(), typetableInterface, ERowInsertMode::after_last); } void BuiltinTable::OnPasteRow() @@ -298,13 +244,6 @@ void BuiltinTable::OnDeleteRow() QModelIndex current = types_table->selectionModel()->currentIndex(); current = sortModel->mapToSource(current); typetableModel->RemoveRow(current); - //typetableInterface-> - //Builtin* holderPtr = static_cast(current.internalPointer()); - - //std::function func = [&](const Builtin& val1){return val1 == *holderPtr;}; - //it = std::find_if(builtins.begin(),builtins.end(), std::bind(func, std::placeholders::_1)); - - } void BuiltinTable::OnCopyRow() @@ -397,7 +336,6 @@ void BuiltinTable::OnFilterTable(QString val) { sortModel->setFilterCaseSensitivity(Qt::CaseInsensitive); sortModel->setFilterRegExp(val); - //sortModel->setDynamicSortFilter(true); } diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h index 77dbf9f4e..451d643e3 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.h +++ b/src/dialog/GenerationSettingsBuiltinTable.h @@ -1,14 +1,12 @@ #ifndef GENERATIONSETTINGSBUILTINTABLE_H #define GENERATIONSETTINGSBUILTINTABLE_H #include -class QTableView; -#include "Libs/L_UniversalModels/include/ItemController.h" #include "Libs/L_UniversalModels/include/TableDataInterface.h" #include "Libs/L_UniversalModels/include/TableDataListHolder.h" #include "GenerationSettings.h" +class QTableView; class AdaptingTableModel; -//class Builtin; class QCheckBox; class QPushButton; class QLabel; @@ -60,11 +58,6 @@ class BuiltinTable : public QWidget QMenu* menuRow = nullptr; QList rollbackBuiltins; public slots: - void OnAddNewType(); - void OnCppVisibilityToggled(bool); - void OnJavaVisibilityToggled(bool); - void OnIdlVisibilityToggled(bool); - void OnInsertNewRow(); void OnPasteRow(); void OnDeleteRow(); diff --git a/src/dialog/GenerationSettingsDialog.h b/src/dialog/GenerationSettingsDialog.h index 20652570d..6c1eed4e8 100644 --- a/src/dialog/GenerationSettingsDialog.h +++ b/src/dialog/GenerationSettingsDialog.h @@ -53,12 +53,10 @@ class GenerationSettingsDialog : public Q3TabDialog 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; From e584aa2ca04bdaec8fbfd342aecbc54dc4463c8e Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 12:47:08 +0400 Subject: [PATCH 032/297] Reopening class dialog did not reinitialize formals list - fixed Reopening class dialog did not reinitialize properties tab - fixed Reopening class dialog did not reinitialize inherit list - fixed --- .../L_UniversalModels/UML/models/42.session | 4 - src/dialog/ClassDialog.cpp | 99 ++++++++++++++++++- src/dialog/ClassDialog.h | 10 +- src/dialog/GenerationSettingsBuiltinTable.cpp | 6 +- 4 files changed, 103 insertions(+), 16 deletions(-) diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index a9a2dee2c..91cca5aa9 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,13 +4,9 @@ diagrams 1047 806 100 3 0 0 end show_stereotypes -marked - class_ref 748458 // TableDataListHolder -end selected package_ref 129 // models open - extra_member_ref 188970 // object operation_ref 2277034 // get_flagsFunctors operation_ref 2276906 // flags operation_ref 2276778 // AddFlagsFunctor diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp index 897def8c2..f5142d9c9 100644 --- a/src/dialog/ClassDialog.cpp +++ b/src/dialog/ClassDialog.cpp @@ -1909,7 +1909,7 @@ 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) { @@ -1969,6 +1969,73 @@ FormalParamsTable::FormalParamsTable(ClassData * cl, QWidget * parent, } } +void FormalParamsTable::Reinitiliaze(ClassData *cl, QStringList &node_names, bool isWritable) +{ + int oldRowCount = numRows()-1; + for (int index = oldRowCount; index > -1; index -= 1) { + removeRow(index); + } + int sup = cl->get_n_formalparams(); + types = node_names; + setNumRows(sup + 1); + + if (isWritable) + { + setNumCols(5); + adjustColumn(4); + setColumnStretchable(4, FALSE); + horizontalHeader()->setLabel(4, TR("do")); + + connect(this, SIGNAL(pressed(int, int, int, const QPoint &)), + this, SLOT(button_pressed(int, int, int, const QPoint &))); + connect(this, SIGNAL(valueChanged(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(this, cl->get_formalparam_default_value(index, TRUE), types)); + setItem(index, 3, new ComboItem(this, 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)); + setText(index, 4, QString()); + } + else + { + setNumCols(4); + 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))); + + for (int 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()))); + + } + + + for (int index = 0; index < sup; index += 1) { + setItem(index, 0, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_name(index))); + + if (!isWritable) + setItem(index, 1, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_value(index))); + else + setItem(index, 1, new ComboItem(this, cl->get_actualparam_value(index), types)); + } + } +} + void FormalParamsTable::activateNextCell() { int row = currentRow(); @@ -2303,7 +2370,7 @@ 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); @@ -2318,7 +2385,7 @@ ActualParamsTable::ActualParamsTable(ClassData * cl, QWidget * parent, for (index = 0; index < sup; index += 1) { setItem(index, 0, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_name(index))); - if (visit) + if (!isWritable) setItem(index, 1, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_value(index))); else setItem(index, 1, new ComboItem(this, cl->get_actualparam_value(index), types)); @@ -2329,6 +2396,28 @@ ActualParamsTable::ActualParamsTable(ClassData * cl, QWidget * parent, setColumnStretchable(1, TRUE); } +void ActualParamsTable::Reinitiliaze(ClassData * cl, QStringList & node_names, bool isWritable) +{ + int oldRowCount = numRows()-1; + for (int index = oldRowCount; index > -1; index -= 1) { + removeRow(index); + } + + int sup = cl->get_n_actualparams(); + types = node_names; + setNumRows(sup); + for (int index = 0; index < sup; index += 1) { + setItem(index, 0, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_name(index))); + + if (!isWritable) + setItem(index, 1, new TableItem(this, Q3TableItem::Never, cl->get_actualparam_value(index))); + else + setItem(index, 1, new ComboItem(this, cl->get_actualparam_value(index), types)); + } + types = node_names; + +} + #if 0 void ActualParamsTable::activateNextCell() { @@ -3065,10 +3154,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) @@ -3556,7 +3647,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl) // USER : list key - value ShowTab("Properties"); - kvtable->updateNodeFromThis(currentNode); + kvtable->updateThisFromNode(currentNode); kvtable->remove("stereotypeCheck"); kvtable->remove("stereotypeSetParameters"); kvtable->remove("stereotypeCheckParameters"); diff --git a/src/dialog/ClassDialog.h b/src/dialog/ClassDialog.h index a566a42c5..70303e4ed 100644 --- a/src/dialog/ClassDialog.h +++ b/src/dialog/ClassDialog.h @@ -325,7 +325,7 @@ class FormalParamsTable : public MyTable Q_OBJECT protected: - const QStringList & types; + QStringList & types; static QString type_copy; static QString name_copy; // copy/cut/paste @@ -334,7 +334,8 @@ class FormalParamsTable : public MyTable 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(); @@ -362,11 +363,12 @@ protected slots: 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); diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index bdd4ac1df..31dfb28d4 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -158,6 +158,7 @@ void BuiltinTable::TableSetup() types_table->setSortingEnabled(true); types_table->resizeColumnToContents(0); types_table->resizeColumnToContents(8); + types_table->resizeRowsToContents(); } void BuiltinTable::InitInterface() @@ -301,7 +302,7 @@ void BuiltinTable::SetupAccess() holder->AddGetter(QPair(8,0), [] (const Builtin* ) { - return QVariant(QString(" ")); + return QVariant(QString(" ")); }); holder->AddFlagsFunctor( @@ -316,9 +317,6 @@ void BuiltinTable::SetupAccess() ); } - - - void BuiltinTable::OnCallRowMenu(const QModelIndex & index) { if(index.column() == 8) From ed86362de8d272e2ce8379d6f18341855f17e833 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 13:40:47 +0400 Subject: [PATCH 033/297] !!!exceptions table in operation dialog is not reinitializing. fixed behaviour of visited view. It will no longer appear on any node traverse acion it is now possible to unmark items from marked view --- src/browser/BrowserNode.h | 1 + src/diagram/BrowserView.cpp | 22 +++++++++++- src/diagram/BrowserView.h | 2 ++ src/diagram/UmlWindow.cpp | 2 ++ src/diagram/UmlWindow.h | 3 -- src/dialog/ClassDialog.cpp | 8 ++--- src/dialog/OperationDialog.cpp | 63 ++++++++++++++++++---------------- src/dialog/OperationDialog.h | 1 + src/ui/catalogwidget.cpp | 39 +++++++++++++++++++-- src/ui/catalogwidget.h | 8 ++++- 10 files changed, 108 insertions(+), 41 deletions(-) diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index c17a39665..4913c9aef 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -77,6 +77,7 @@ class BrowserNode : public Q3ListViewItem, QString name; WrapperStr comment; QByteArray tempBa; + friend class BrowserView; int original_id = 0; // from project library bool is_new = true; // backup file useless bool is_deleted = false; diff --git a/src/diagram/BrowserView.cpp b/src/diagram/BrowserView.cpp index 43b221d19..3bcc87900 100644 --- a/src/diagram/BrowserView.cpp +++ b/src/diagram/BrowserView.cpp @@ -270,9 +270,12 @@ void BrowserView::contentsMousePressEvent(QMouseEvent * e) selected(i); if (e->button() == ::Qt::LeftButton) { - if (!((BrowserNode *) i)->deletedp() && (i != project)) { + if (!((BrowserNode *) i)->deletedp() && (i != project)) + { if (e->state() & ::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))*/) { @@ -394,6 +397,23 @@ void BrowserView::OnGenerateIdl() } } +void BrowserView::OnUnmarkItem(QString name, int type) +{ + Q3PtrListIterator it( BrowserNode::marked_list ); + BrowserNode *node; + while ( (node = it.current()) != 0 ) + { + ++it; + 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(); diff --git a/src/diagram/BrowserView.h b/src/diagram/BrowserView.h index 60e01bf63..8f9e4a561 100644 --- a/src/diagram/BrowserView.h +++ b/src/diagram/BrowserView.h @@ -115,6 +115,8 @@ public slots: void OnGeneratePhp(); void OnGeneratePython(); void OnGenerateIdl(); + void OnUnmarkItem(QString name, int type); + void OnUnmarkAll(); signals: void marked_list(QList); }; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 8a45d4c52..0210e04dd 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -483,6 +483,8 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) browser = new BrowserView(); wdgCatalog->Init(this, browser); + connect(wdgCatalog, SIGNAL(markedRemove(QString,int)), browser, SLOT(OnUnmarkItem(QString,int))); + connect(wdgCatalog, SIGNAL(allMarkedRemove()), browser, SLOT(OnUnmarkAll())); splTreeTab = new QSplitter(Qt::Vertical, spl1); splTreeTab->addWidget(browser); diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index 4f6c35f2f..252699fb8 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -265,11 +265,8 @@ private slots: public slots: void whats_this() const; - //void OnUpdateVisitedView(Q3ListViewItem*); - //void OnPerformVisitedFiltering(); void OnPickSelectionFromItem(const QModelIndex&,const QModelIndex& ); - }; extern QString template_project(); diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp index f5142d9c9..9ebca0d18 100644 --- a/src/dialog/ClassDialog.cpp +++ b/src/dialog/ClassDialog.cpp @@ -2630,9 +2630,7 @@ void ClassDialog::InitGui() active_cb = new QCheckBox("active", opt_bg); // setting up radiobutton group for accessibility - //todo make external // ASSUMING INSTANTIATE ON NULL - uml_visibility.init(htabUml, cl->get_uml_visibility(), TRUE); //toAdd basetypelbl = new QLabel(TR("base type : "), grid); @@ -2912,9 +2910,8 @@ void ClassDialog::InitGui() pbINotGeneratedInIdl = new QPushButton(TR("Not generated in IDL"), htabidl); addTab(idltab, "Idl"); - // Profiled stereotype - + // Profiled stereotype stereotypeGrid = new Q3Grid(2, this); stereotypetab = stereotypeGrid; RegisterTab("Stereotype", stereotypetab); @@ -3550,7 +3547,8 @@ 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"); diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 8b460e0ef..ccb05b6f2 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -198,8 +198,7 @@ void OperationDialog::init_uml() new QLabel(TR("class : "), umlGrid); lblFullClassName = new QLabel(((BrowserNode *) oper->get_browser_node()->parent())->full_name(TRUE), - umlGrid); //todo - + umlGrid); new QLabel(TR("name : "), umlGrid); edname = new LineEdit(oper->name(), umlGrid); @@ -241,7 +240,7 @@ void OperationDialog::init_uml() 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 + table = new ParamsTable(oper, umlGrid, list, this, !isWritable); new QLabel(TR("exceptions : "), umlGrid); etable = new ExceptionsTable(oper, umlGrid, list, !isWritable); //todo update the table @@ -5517,6 +5516,38 @@ ExceptionsTable::ExceptionsTable(OperationData * o, QWidget * parent, } } +void ExceptionsTable::Reinitialize(OperationData *a, const QStringList &list, bool visit) +{ +} + + +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); + } +} + void ExceptionsTable::activateNextCell() { int row = currentRow(); @@ -5704,32 +5735,6 @@ 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 { diff --git a/src/dialog/OperationDialog.h b/src/dialog/OperationDialog.h index 9dad64f33..25e449fec 100644 --- a/src/dialog/OperationDialog.h +++ b/src/dialog/OperationDialog.h @@ -424,6 +424,7 @@ class ExceptionsTable : public MyTable public: ExceptionsTable(OperationData * a, QWidget * parent, const QStringList & list, bool visit); + void Reinitialize(OperationData * a, const QStringList & list, bool visit); protected: virtual void activateNextCell(); diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index 865160800..c00691e77 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -39,6 +39,7 @@ #include "ClassData.h" #include #include +#include #include CatalogWidget::CatalogWidget( QWidget *parent) : @@ -109,7 +110,9 @@ void CatalogWidget::Init(UmlWindow* window, BrowserView* view) 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() @@ -292,7 +295,17 @@ void CatalogWidget::CreateFavouritesMenu() if(favouritesMenu.isNull()) { favouritesMenu.reset(new QMenu()); - favouritesMenu->addAction("Remove from favourites", this, SLOT(OnRemoveCurrentItemFromFavourites())); + 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())); } } @@ -333,11 +346,32 @@ void CatalogWidget::OnRemoveCurrentItemFromFavourites() tmodFavourites->InsertRootItem(rootFavouritesInterface); } +void CatalogWidget::OnRemoveCurrentItemFromMarked() +{ + QModelIndex current = ui->tvMarkedNodes->currentIndex(); + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* itemAsNode = static_cast(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) { @@ -374,7 +408,7 @@ void CatalogWidget::OnUpdateVisitedView(Q3ListViewItem * item) { if(UseSkipVisited()) return; - this->ui->tabWidget->setCurrentWidget(this->ui->tabVisited); + //this->ui->tabWidget->setCurrentWidget(this->ui->tabVisited); BrowserNode* itemAsNode = static_cast(item); itemAsNode = itemAsNode->get_first_generatable_node(); @@ -386,6 +420,7 @@ void CatalogWidget::OnUpdateMarkedView(QList markedItems) this->ui->tabWidget->setCurrentWidget(this->ui->tabMarked); if(rootMarkedInterface.isNull()) return; + StageSkipVisited(); QList > items; rootMarkedInterface->removeChildren(0, rootMarkedInterface->childCount()); for(BrowserNode * marked : markedItems) diff --git a/src/ui/catalogwidget.h b/src/ui/catalogwidget.h index 01038b949..c2738c9f0 100644 --- a/src/ui/catalogwidget.h +++ b/src/ui/catalogwidget.h @@ -61,6 +61,7 @@ class CatalogWidget : public QWidget BrowserView* originalView = nullptr; UmlWindow* mainWindow = nullptr; QScopedPointer favouritesMenu; + QScopedPointer markedMenu; bool skipVisited = false; // visited treeview @@ -101,6 +102,7 @@ class CatalogWidget : public QWidget bool RemoveExisting(BrowserNode *,QSharedPointer ); bool AddToFavourites(BrowserNode*); void CreateFavouritesMenu(); + void CreateMarkedMenu(); void PullNodeUpwardsInVisited(BrowserNode*); public slots: @@ -113,9 +115,13 @@ public slots: 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(); }; From b4c93b6a3b82b6ef7c9ad30d74bd8f7a1d32b342 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 14:11:51 +0400 Subject: [PATCH 034/297] added reinitialization for exceptions table in oepration dialog --- src/dialog/ClassDialog.cpp | 4 +-- src/dialog/OperationDialog.cpp | 58 ++++++++++++++++++++++++++++++---- src/dialog/OperationDialog.h | 6 ++-- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp index 9ebca0d18..7991637ca 100644 --- a/src/dialog/ClassDialog.cpp +++ b/src/dialog/ClassDialog.cpp @@ -432,9 +432,9 @@ 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 it(inh); diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index ccb05b6f2..e7f0720d4 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -353,14 +353,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()); @@ -3231,8 +3234,8 @@ bool OperationDialog::SaveData() { BrowserClass* containingClass = static_cast(oper->browser_node->get_container(UmlClass)); QList passedNodes; - QList inheritanceSiblings; bool goBack = true; + QList inheritanceSiblings; inheritanceSiblings = containingClass->CollectSameThroughInheritance(oper, passedNodes, goBack); bool propagateThroughInheritance = false; OperationData* operCopy = new OperationData(oper, (BrowserOperation*)oper->get_browser_node()); @@ -5476,7 +5479,7 @@ 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; @@ -5487,7 +5490,8 @@ ExceptionsTable::ExceptionsTable(OperationData * o, QWidget * parent, setRowMovingEnabled(TRUE); horizontalHeader()->setLabel(0, TR("Type")); - if (visit) { + if (visit) + { for (index = 0; index < sup; index += 1) setItem(index, 0, new TableItem(this, Q3TableItem::Never, o->get_exception(index).get_full_type())); } @@ -5516,8 +5520,48 @@ ExceptionsTable::ExceptionsTable(OperationData * o, QWidget * parent, } } -void ExceptionsTable::Reinitialize(OperationData *a, const QStringList &list, bool visit) +void ExceptionsTable::Reinitialize(OperationData *o, QStringList &list, bool isWritable) { + types = list; + int oldRowCount = numRows()-1; + for (int index = oldRowCount; index > -1; index -= 1) { + removeRow(index); + } + int sup = o->get_n_exceptions(); + setNumRows(sup+1); + + if (!isWritable) + { + 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))); + setNumCols(1); + for (int index = 0; index < sup; index += 1) + setItem(index, 0, new TableItem(this, Q3TableItem::Never, o->get_exception(index).get_full_type())); + } + else + { + setNumCols(2); + horizontalHeader()->setLabel(1, TR("do")); + setColumnStretchable(1, FALSE); + adjustColumn(1); + + int index; + for (index = 0; index < sup; index += 1) { + setItem(index, 0, new ComboItem(this, o->get_exception(index).get_full_type(), types)); + setText(index, 1, QString()); + } + + setItem(index, 0, new ComboItem(this, QString(), types)); + setText(index, 1, 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)), + this, SLOT(value_changed(int, int))); + + } + } diff --git a/src/dialog/OperationDialog.h b/src/dialog/OperationDialog.h index 25e449fec..9a0220f92 100644 --- a/src/dialog/OperationDialog.h +++ b/src/dialog/OperationDialog.h @@ -417,14 +417,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); - void Reinitialize(OperationData * a, const QStringList & list, bool visit); + QStringList & list, bool visit); + void Reinitialize(OperationData * a, QStringList & list, bool visit); protected: virtual void activateNextCell(); From 541a64f526db6035c2fa6989e0b882aed88a9348 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 14:17:12 +0400 Subject: [PATCH 035/297] adding copyright notice to new files --- src/dialog/GenerationSettingsBuiltinTable.cpp | 23 +++++++++++++++++++ src/dialog/GenerationSettingsBuiltinTable.h | 23 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/src/dialog/GenerationSettingsBuiltinTable.cpp b/src/dialog/GenerationSettingsBuiltinTable.cpp index 31dfb28d4..f49479ff7 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.cpp +++ b/src/dialog/GenerationSettingsBuiltinTable.cpp @@ -1,3 +1,26 @@ +// ************************************************************************* +// +// 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" diff --git a/src/dialog/GenerationSettingsBuiltinTable.h b/src/dialog/GenerationSettingsBuiltinTable.h index 451d643e3..252aca335 100644 --- a/src/dialog/GenerationSettingsBuiltinTable.h +++ b/src/dialog/GenerationSettingsBuiltinTable.h @@ -1,3 +1,26 @@ +// ************************************************************************* +// +// 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 From 17b8cee3525773739f5cb2a3b28aaccc929f1c7d Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 16:02:48 +0400 Subject: [PATCH 036/297] Adding changelog for version 1.0b2 --- README.md | 19 ++++++++++++++++--- changelog.txt | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 changelog.txt diff --git a/README.md b/README.md index b972764c5..8f01dbe85 100644 --- a/README.md +++ b/README.md @@ -102,8 +102,20 @@ Enchancements: * 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 + * 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. + + Manual ------ Currently - the manual of Bouml version 4.22 is being used. To access it, set "Manual" path in @@ -111,7 +123,8 @@ Manual Compiling --------- - + L_UniversalModels library needs to be built prior to douml compilation. It is located in src/Libs/L_UniversalModels + * Under Windows: * Mingw based on gcc 4.7+ * Qt 4.7+ built with aforementioned mingw. diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 000000000..c9bedaebb --- /dev/null +++ b/changelog.txt @@ -0,0 +1,35 @@ +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 + 1. cpp header file was not produced correctly on generation of new projects. + 2. 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. + 3. Mini toolbar could crash when user tried navigating above the highest node via arrow buttons. + 4. Some icons were not shown in minit-toolbar. + 5. "Unmark all" did not change the color of generator label. + 6. Propagating changes from abstract operation will not null op definition in subclasses. + 7. Clicking OK in relations dialog while ot editing relation's name produced "illegal name" error. + 8. static class members were incorrectly given "= {$value] " when generated in cpp headers. + 9. In Properties tables around the app pressing enter or any arrow button finished editing of the cell. + 10. Reopening class dialog did not properly reinitialize formals/inheritance/properties. + 10. Reopening operation dialog did not properly reinitialize exceptions. + + +Features + 1. 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). + 2. "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. + + \ No newline at end of file From c99fdc1b6f48f337ac0925f5e4f4bea147d181e8 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 24 Feb 2013 16:30:30 +0400 Subject: [PATCH 037/297] some minor warning fixes --- README.md | 2 +- src/CppGenerator/UmlArtifact.cpp | 3 --- src/CppGenerator/UmlOperation.cpp | 8 ++++---- src/CppReverse/Package.cpp | 2 +- src/CppReverse/UmlAttribute.cpp | 2 +- src/CppReverse/UmlOperation.cpp | 14 +++++++------- src/IdlGenerator/UmlOperation.cpp | 6 +++--- src/JavaCat/Package.cpp | 4 ++-- src/JavaCat/UmlAttribute.cpp | 5 +++-- src/JavaCat/UmlClass.cpp | 2 +- src/JavaGenerator/UmlOperation.cpp | 4 ++-- src/douml.pro | 2 +- 12 files changed, 26 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 8f01dbe85..6cc7b64db 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -DoUML version 1.0b +DoUML version 1.0b2 ================== *** IMPORTANT NOTICE *** diff --git a/src/CppGenerator/UmlArtifact.cpp b/src/CppGenerator/UmlArtifact.cpp index 0d323c504..c0fcf704e 100644 --- a/src/CppGenerator/UmlArtifact.cpp +++ b/src/CppGenerator/UmlArtifact.cpp @@ -185,9 +185,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)) diff --git a/src/CppGenerator/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp index 932712390..566883ff7 100644 --- a/src/CppGenerator/UmlOperation.cpp +++ b/src/CppGenerator/UmlOperation.cpp @@ -188,7 +188,7 @@ void UmlOperation::compute_dependency(Q3PtrList & 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; @@ -309,7 +309,7 @@ void UmlOperation::compute_dependency(Q3PtrList & dependencies, static bool generate_type(const Q3ValueList & params, unsigned rank, QTextStream & f_h) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; UmlClass::write(f_h, params[rank].type); @@ -320,7 +320,7 @@ static bool generate_type(const Q3ValueList & params, static bool generate_var(const Q3ValueList & params, unsigned rank, QTextStream & f_h) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; f_h << params[rank].name; @@ -330,7 +330,7 @@ static bool generate_var(const Q3ValueList & params, static bool generate_init(const Q3ValueList & params, unsigned rank, QTextStream & f_h) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; if (! params[rank].default_value.isEmpty()) diff --git a/src/CppReverse/Package.cpp b/src/CppReverse/Package.cpp index 5f767a749..d03776dd1 100644 --- a/src/CppReverse/Package.cpp +++ b/src/CppReverse/Package.cpp @@ -512,7 +512,7 @@ void Package::scan_dirs(int & n) static bool allowed(QRegExp * rg, QString f) { if (rg != 0) { - int matchLen; + //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()));*/ diff --git a/src/CppReverse/UmlAttribute.cpp b/src/CppReverse/UmlAttribute.cpp index 647839645..357196cb1 100644 --- a/src/CppReverse/UmlAttribute.cpp +++ b/src/CppReverse/UmlAttribute.cpp @@ -195,7 +195,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)) { diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp index eedefb8a2..731a6f89b 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -281,7 +281,7 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name, cl->compute_type(type, return_type, typeform, FALSE, tmplts); } - int index; + int index = 0; WrapperStr decl; if (op != 0) { @@ -1271,7 +1271,7 @@ bool UmlOperation::operations(Q3PtrList & 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 " + Lex::quote(name) + ""); return TRUE; @@ -1498,7 +1498,7 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name, UmlClass * cl = 0; do { - if ((nargs == ~0u) || (it.current()->params().count() == nargs)) { + if ((nargs == ~0u) || (it.current()->params().count() == (int)nargs)) { if (cl != it.current()->parent()) { cl = (UmlClass *) it.current()->parent(); cl->set_under_construction(TRUE, TRUE); @@ -1544,7 +1544,7 @@ bool UmlOperation::reverse_if_def(Package * pack, param_names.setAutoDelete(TRUE); while (read_param(pack /*yes !*/, rank, param, decl, tmplts, on_error, FALSE)) { - if ((params.count() <= rank) || + if ((params.count() <= (int)rank) || (params[rank].dir != param.dir) || (params[rank].type.toString() != param.type.toString())) // uncompatible @@ -1635,14 +1635,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; @@ -1703,7 +1703,7 @@ bool UmlOperation::reverse_if_def(Package * pack, else { #ifdef ROUNDTRIP - while (params.count() != nargs) { + while (params.count() != (int)nargs) { #if QT_VERSION == 230 Q3ValueList::Iterator it = params.end(); diff --git a/src/IdlGenerator/UmlOperation.cpp b/src/IdlGenerator/UmlOperation.cpp index 1c7a5411d..123132d8d 100644 --- a/src/IdlGenerator/UmlOperation.cpp +++ b/src/IdlGenerator/UmlOperation.cpp @@ -43,7 +43,7 @@ static bool generate_dir(const Q3ValueList & params, unsigned rank, QTextStream & f) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; switch (params[rank].dir) { @@ -65,7 +65,7 @@ static bool generate_dir(const Q3ValueList & params, static bool generate_type(const Q3ValueList & params, unsigned rank, QTextStream & f) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; UmlClass::write(f, params[rank].type); @@ -75,7 +75,7 @@ static bool generate_type(const Q3ValueList & params, static bool generate_var(const Q3ValueList & params, unsigned rank, QTextStream & f) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; f << params[rank].name; diff --git a/src/JavaCat/Package.cpp b/src/JavaCat/Package.cpp index 399706eb2..ce1690913 100644 --- a/src/JavaCat/Package.cpp +++ b/src/JavaCat/Package.cpp @@ -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; } @@ -396,7 +397,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()));*/ diff --git a/src/JavaCat/UmlAttribute.cpp b/src/JavaCat/UmlAttribute.cpp index 7a8de8ad0..52e82250b 100644 --- a/src/JavaCat/UmlAttribute.cpp +++ b/src/JavaCat/UmlAttribute.cpp @@ -302,11 +302,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 ... diff --git a/src/JavaCat/UmlClass.cpp b/src/JavaCat/UmlClass.cpp index 878d43802..bfb65b19f 100644 --- a/src/JavaCat/UmlClass.cpp +++ b/src/JavaCat/UmlClass.cpp @@ -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) { diff --git a/src/JavaGenerator/UmlOperation.cpp b/src/JavaGenerator/UmlOperation.cpp index a317918f0..b5039a4ed 100644 --- a/src/JavaGenerator/UmlOperation.cpp +++ b/src/JavaGenerator/UmlOperation.cpp @@ -53,7 +53,7 @@ const int BodyPostfixLength = 28; static bool generate_type(const Q3ValueList & params, unsigned rank, QTextStream & f) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; UmlClass::write(f, params[rank].type); @@ -63,7 +63,7 @@ static bool generate_type(const Q3ValueList & params, static bool generate_var(const Q3ValueList & params, unsigned rank, QTextStream & f) { - if (rank >= params.count()) + if ((int)rank >= params.count()) return FALSE; f << params[rank].name; diff --git a/src/douml.pro b/src/douml.pro index 4aaf36718..4aacd6677 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -570,7 +570,7 @@ UI_DIR = ui DESTDIR = ../bin QMAKE_CXXFLAGS += -std=gnu++11 -LIBS += -L../bin -lUniversalModelsd +LIBS += -L../bin -lUniversalModels RESOURCES += icons.qrc FORMS += \ From fe6768fa550559d0b339df68072c6b57906f9494 Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 25 Feb 2013 00:52:23 +0400 Subject: [PATCH 038/297] trying to make propagation work a little better --- src/browser/BrowserClass.cpp | 9 ++- src/data/OperationData.cpp | 135 ++++++++++++++++++++++++++++++++--- src/data/OperationData.h | 2 + 3 files changed, 137 insertions(+), 9 deletions(-) diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 1ca79f756..aef1a36ea 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -892,9 +892,16 @@ QList BrowserClass::CollectSameThroughInheritance(OperationData //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(); diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 29f43296d..748fbcb4c 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -168,24 +168,24 @@ 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_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; @@ -207,7 +207,7 @@ 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; @@ -4016,3 +4016,122 @@ bool operator==(const OperationData & origin, const OperationData & another) } + +bool PropagationEquality(const OperationData & origin, const OperationData & another) +{ + bool paramsResult = false; + if(!origin.params && !another.params) + paramsResult = true; + else if(origin.params != another.params) + { + if(origin.params == nullptr) + return false; + else if(another.params == nullptr) + return false; + paramsResult = *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_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; +} diff --git a/src/data/OperationData.h b/src/data/OperationData.h index 5cac8e39f..788d060b3 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -132,6 +132,7 @@ 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); @@ -389,6 +390,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 From a0c3c7e230efc23b5a116222db1491dfee97003a Mon Sep 17 00:00:00 2001 From: zeks Date: Wed, 27 Feb 2013 22:53:43 +0400 Subject: [PATCH 039/297] fixed endless cycle on diagram open --- src/browser/BrowserNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 1e808e5db..d68fd1547 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -742,7 +742,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; From 3939071c7a6b1b636d51a75d7e4bc686271cadf2 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 3 Mar 2013 01:02:04 +0400 Subject: [PATCH 040/297] skeleton quickedit code copy-pasted from catalog widget --- src/CustomWidgets/quickedit.cpp | 183 ++++++++++++++++++++++++++++++++ src/CustomWidgets/quickedit.h | 61 +++++++++++ src/CustomWidgets/quickedit.ui | 102 ++++++++++++++++++ src/douml.pro | 9 +- 4 files changed, 352 insertions(+), 3 deletions(-) create mode 100644 src/CustomWidgets/quickedit.cpp create mode 100644 src/CustomWidgets/quickedit.h create mode 100644 src/CustomWidgets/quickedit.ui diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp new file mode 100644 index 000000000..3169488fa --- /dev/null +++ b/src/CustomWidgets/quickedit.cpp @@ -0,0 +1,183 @@ +#include "quickedit.h" +#include "ui_quickedit.h" + +QuickEdit::QuickEdit(QWidget *parent) : + QWidget(parent), + ui(new Ui::QuickEdit) +{ + ui->setupUi(this); +} + +QuickEdit::~QuickEdit() +{ + delete ui; +} + + +void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, TreeModel* model, QSharedPointer interface) +{ + std::function dataAccessFunc = + [](BrowserNode* data){return QVariant(data->get_name());}; + + std::function > ()> checksFunc = + std::bind(&CatalogWidget::CreateCheckList, this); + + TreeFunctions::FilterTreeAndRestoreNodes + (dataAccessFunc, checksFunc, + expandedNodes, view, model, interface); +} + +void QuickEdit::OnContextMenu(QPoint point) +{ + CreateFavouritesMenu(); + CreateMenu->popup(ui->tvEditor->mapToGlobal(point)); +} + + +void QuickEdit::CreateMenu() +{ + if(favouritesMenu.isNull()) + { + favouritesMenu.reset(new QMenu()); + favouritesMenu->addAction(tr("Remove from favourites"), this, SLOT(OnRemoveCurrentItemFromFavourites())); + } +} + +QList > QuickEdit::CreateCheckList() +{ + QList > result; + if(!ui->leVisitedSearch->text().trimmed().isEmpty()) + { + QString value = ui->leVisitedSearch->text(); + std::function addressFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(iface->InternalPointer()); + bool match = data->get_name().contains(value, Qt::CaseInsensitive); + return match; + }; + result.append(addressFilterFunc); + } + return result; +} + +#define ADD_STRING_GETSET(HOLDER,ROW,ROLE,PARAM) \ +HOLDER->AddGetter(QPair(ROW,ROLE), \ +[] (const Builtin* data) \ +{ \ + if(data) \ + return QVariant(data->PARAM); \ + else \ + return QVariant(); \ +} \ +); \ +HOLDER->AddSetter(QPair(ROW,ROLE), \ +[] (Builtin* data, QVariant value) \ +{ \ + if(data) \ + data->PARAM = value.toString(); \ +} \ +); + + +void QuickEdit::SetupTreeController(QSharedPointer >& treeController) +{ + treeController = QSharedPointer >( new ItemController()); + treeController->AddGetter(QPair(0,0), + + [] (const BrowserNode* data) + { + if(data) + return QVariant(data->get_name()); + else + return QVariant(); + } + ); + + treeController->AddGetter(QPair(0,1), + + [] (const BrowserNode* data) + { + 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; + } + ); +} + +void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, + QSharedPointer &interface, + QSharedPointer > &controller, + QSharedPointer &data, QWidget* originalView ,const char* slotName) +{ + model = new TreeModel(); + SetupTreeController(controller); + + TreeItem* pointer = new TreeItem(0); + interface = QSharedPointer(pointer); + QList > items; + pointer->SetController(controller); + pointer->addChildren(items); + + data = QSharedPointer(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 QuickEdit::Init(UmlWindow* window, BrowserView* view) +{ + originalView = view; + mainWindow = window; + + connect(view, SIGNAL(selectionChanged(Q3ListViewItem *)), + this, SLOT(OnUpdateVisitedView(Q3ListViewItem *))); + connect(ui->leVisitedSearch, SIGNAL(textChanged(QString)), this, SLOT(OnPerformVisitedFiltering(QString))); + + qRegisterMetaType>("QList"); + connect(view, SIGNAL(marked_list(QList)), this, SLOT(OnUpdateMarkedView(QList))); + + 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::functionfavsFunc = 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 QuickEdit::OnContextMenu(QPoint) +{ + + +} diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h new file mode 100644 index 000000000..4cf594ee8 --- /dev/null +++ b/src/CustomWidgets/quickedit.h @@ -0,0 +1,61 @@ +#ifndef QUICKEDIT_H +#define QUICKEDIT_H + +#include +#include +#include +#include +#include "Libs/L_UniversalModels/include/ItemController.h" + +namespace Ui { +class QuickEdit; +} +class BrowserView; +class TreeModel; +class BrowserNode; +class TreeItemInterface; +class QTreeView; +class Q3ListViewItem; +class GenericEventFilter; +class UmlWindow; + +class QuickEdit : public QWidget +{ + Q_OBJECT + +public: + explicit QuickEdit(QWidget *parent = 0); + ~QuickEdit(); + void Init(UmlWindow* window, BrowserView* view); + +private: + Ui::QuickEdit *ui = nullptr; + BrowserView* dummyView = nullptr; + BrowserView* originalView = nullptr; + UmlWindow* mainWindow = nullptr; + QScopedPointer contextMenu; + + // visited treeview + TreeModel* tmodVisited = nullptr; + bool isFilteredVisited = false; + QStringList expandedNodesVisited; + QSharedPointer rootVisitedInterface; + QSharedPointer > controllerVisited; + QSharedPointer rootVisited; + + + void SetupTreeModel(TreeModel*& , QTreeView*, + QSharedPointer&, + QSharedPointer >&, + QSharedPointer&, QWidget *window, const char *); + void SetupTreeController(QSharedPointer >&); + void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); + QList > CreateCheckList(); + void CreateMenu(); + + public slots: + void OnContextMenu(QPoint); + +}; + +#endif // QUICKEDIT_H diff --git a/src/CustomWidgets/quickedit.ui b/src/CustomWidgets/quickedit.ui new file mode 100644 index 000000000..3b6df672b --- /dev/null +++ b/src/CustomWidgets/quickedit.ui @@ -0,0 +1,102 @@ + + + QuickEdit + + + + 0 + 0 + 927 + 595 + + + + Form + + + + 0 + + + + + + + + + + + + + Previous Item + + + + + + + Next Item + + + + + + + + + + C++ + + + + + + + Java + + + + + + + Python + + + + + + + Php + + + + + + + Idl + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + diff --git a/src/douml.pro b/src/douml.pro index 4aacd6677..aded296d0 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -235,7 +235,8 @@ HEADERS = \ dialog/edgemenudialogbase.h \ ui/catalogwidget.h \ browser/BrowserNodeDummy.h \ - dialog/GenerationSettingsBuiltinTable.h + dialog/GenerationSettingsBuiltinTable.h \ + CustomWidgets/quickedit.h SOURCES = \ @@ -517,7 +518,8 @@ SOURCES = \ misc/codec.cpp \ ui/catalogwidget.cpp \ browser/BrowserNodeDummy.cpp \ - dialog/GenerationSettingsBuiltinTable.cpp + dialog/GenerationSettingsBuiltinTable.cpp \ + CustomWidgets/quickedit.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM @@ -576,5 +578,6 @@ RESOURCES += icons.qrc FORMS += \ ui/operationwidgetcpp.ui \ ui/constructorinitializerdialog.ui \ - ui/catalogwidget.ui + ui/catalogwidget.ui \ + CustomWidgets/quickedit.ui From 5ae65c610c75e198468185f1312187339cc6de82 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 3 Mar 2013 22:26:08 +0400 Subject: [PATCH 041/297] temporary save point. not working --- src/CustomWidgets/quickedit.cpp | 308 ++++++++++++------ src/CustomWidgets/quickedit.h | 56 +++- src/Libs/L_UniversalModels/UML/models/201002 | 14 +- .../L_UniversalModels/UML/models/42.session | 15 +- src/Libs/L_UniversalModels/include/TreeItem.h | 33 +- .../include/TreeItemInterface.h | 26 +- .../src/TreeItemInterface.cpp | 24 +- src/browser/BrowserClass.h | 1 + src/browser/BrowserNode.cpp | 17 + src/browser/BrowserNode.h | 1 + src/browser/BrowserOperation.h | 1 + src/browser/BrowserOperationAttribute.cpp | 120 +++++++ src/browser/BrowserOperationAttribute.h | 54 +++ src/data/AType.h | 4 +- src/data/ClassData.cpp | 5 + src/data/ClassData.h | 2 + src/data/OperationData.h | 8 +- src/dialog/OperationDialog.cpp | 2 +- src/douml.pro | 6 +- 19 files changed, 512 insertions(+), 185 deletions(-) create mode 100644 src/browser/BrowserOperationAttribute.cpp create mode 100644 src/browser/BrowserOperationAttribute.h diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 3169488fa..21bdedd8b 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -1,6 +1,28 @@ #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 "browser/BrowserClass.h" +#include "browser/BrowserOperationAttribute.h" +#include "browser/BrowserNodeDummy.h" +#include "BrowserView.h" +#include "UmlEnum.h" +#include "data/ClassData.h" +#include "data/OperationData.h" + + +#include +#include +#include +#include + + + QuickEdit::QuickEdit(QWidget *parent) : QWidget(parent), ui(new Ui::QuickEdit) @@ -20,7 +42,7 @@ void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, Tre [](BrowserNode* data){return QVariant(data->get_name());}; std::function > ()> checksFunc = - std::bind(&CatalogWidget::CreateCheckList, this); + std::bind(&QuickEdit::CreateCheckList, this); TreeFunctions::FilterTreeAndRestoreNodes (dataAccessFunc, checksFunc, @@ -29,155 +51,251 @@ void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, Tre void QuickEdit::OnContextMenu(QPoint point) { - CreateFavouritesMenu(); - CreateMenu->popup(ui->tvEditor->mapToGlobal(point)); + CreateMenu(); + contextMenu->popup(ui->tvEditor->mapToGlobal(point)); } void QuickEdit::CreateMenu() { - if(favouritesMenu.isNull()) + if(contextMenu.isNull()) { - favouritesMenu.reset(new QMenu()); - favouritesMenu->addAction(tr("Remove from favourites"), this, SLOT(OnRemoveCurrentItemFromFavourites())); + contextMenu.reset(new QMenu()); + contextMenu->addAction(tr("Remove from favourites"), this, SLOT(OnRemoveCurrentItemFromFavourites())); } } +void QuickEdit::SetupItemCreationFuncs() +{ +// itemCreators.insert(UmlAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); +// itemCreators.insert(UmlAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2));/*composition?*/ +// itemCreators.insert(UmlDirectionalAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); +// itemCreators.insert(UmlDirectionalAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); + //void QuickEdit::AssignItemsForClass(QSharedPointer root, BrowserNode * classNode) + + //std::function<> + itemCreators.insert(UmlClass, std::bind(&QuickEdit::AssignItemsForClass, this, std::placeholders::_1, std::placeholders::_2)); + //itemCreators.insert(UmlAttribute, std::bind(CreateItemsForAttribute, this, std::placeholders::_1, std::placeholders::_2)); + itemCreators.insert(UmlOperation, std::bind(&QuickEdit::AssignItemsForOperation, this, std::placeholders::_1, std::placeholders::_2)); + //itemCreators.insert(UmlExtraMember, std::bind(CreateItemsForExternal, this, std::placeholders::_1, std::placeholders::_2)); +} + QList > QuickEdit::CreateCheckList() { - QList > result; - if(!ui->leVisitedSearch->text().trimmed().isEmpty()) - { - QString value = ui->leVisitedSearch->text(); - std::function addressFilterFunc = [value](TreeItemInterface* iface) - { - BrowserNode* data = static_cast(iface->InternalPointer()); - bool match = data->get_name().contains(value, Qt::CaseInsensitive); - return match; - }; - result.append(addressFilterFunc); - } - return result; +// QList > result; +// if(!ui->leVisitedSearch->text().trimmed().isEmpty()) +// { +// QString value = ui->leVisitedSearch->text(); +// std::function addressFilterFunc = [value](TreeItemInterface* iface) +// { +// BrowserNode* data = static_cast(iface->InternalPointer()); +// bool match = data->get_name().contains(value, Qt::CaseInsensitive); +// return match; +// }; +// result.append(addressFilterFunc); +// } +// return result; } -#define ADD_STRING_GETSET(HOLDER,ROW,ROLE,PARAM) \ +void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, + QSharedPointer &interface, + QSharedPointer > &controller, + QSharedPointer &data) +{ + model = new TreeModel(); + SetupClassController(controller); + + TreeItem* pointer = new TreeItem(0); + data = QSharedPointer(new BrowserNodeDummy(dummyView)); + pointer->SetController(controller); + pointer->SetInternalData(data.data()); + controller->SetColumns(QStringList() << "class"); + interface = QSharedPointer(pointer); + model->InsertRootItem(interface); + + view->setModel(model); + view->setContextMenuPolicy(Qt::CustomContextMenu); + view->setEditTriggers(QAbstractItemView::AllEditTriggers); + view->setColumnWidth(0, 230); + view->setExpandsOnDoubleClick(false); + view->setRootIsDecorated(true); +} + +#define ADD_GETSET(TYPE,HOLDER,ROW,ROLE,CONVERTER,ACCESSOR,SETTER) \ HOLDER->AddGetter(QPair(ROW,ROLE), \ -[] (const Builtin* data) \ +[] (const BrowserNode* data) \ { \ - if(data) \ - return QVariant(data->PARAM); \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(pointer->ACCESSOR()); \ else \ return QVariant(); \ } \ ); \ HOLDER->AddSetter(QPair(ROW,ROLE), \ -[] (Builtin* data, QVariant value) \ +[] (BrowserNode* data, QVariant value) \ { \ - if(data) \ - data->PARAM = value.toString(); \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + pointer->SETTER(value.CONVERTER()); \ + pointer->modified();\ + return true;\ } \ ); -void QuickEdit::SetupTreeController(QSharedPointer >& treeController) +// some really insane code from stackoverflow that allows to shorten lengthy ifs +template +bool operator *(const T0& lhs, const std::array& rhs) { + return std::find(begin(rhs), end(rhs), lhs) != end(rhs); +} + +template std::array in(T0 arg0, T...args) { + return {{arg0, args...}}; +} + +void QuickEdit::SetupClassController(QSharedPointer > &) { - treeController = QSharedPointer >( new ItemController()); - treeController->AddGetter(QPair(0,0), + ADD_GETSET(BrowserClass, classController, 1, 0, toString, get_name, set_name); + ADD_GETSET(BrowserClass, classController, 1, 2, toString, get_name, set_name); - [] (const BrowserNode* data) - { - if(data) - return QVariant(data->get_name()); - else - return QVariant(); - } - ); + ADD_GETSET(BrowserClass, classController, 4, 0, toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserClass, classController, 4, 2, toString, get_stereotype, def->set_stereotype); - treeController->AddGetter(QPair(0,1), + ADD_GETSET(BrowserClass, classController, 5, 0, toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, 5, 2, toInt, def->get_uml_visibility, def->set_uml_visibility); - [] (const BrowserNode* data) - { - const QPixmap * pm = data->pixmap(true); - if(!pm) - return QIcon(); - return QIcon(*pm); - } - ); + ADD_GETSET(BrowserClass, classController, 6, 0, toBool, def->get_is_abstract, def->set_is_abstract); + ADD_GETSET(BrowserClass, classController, 6, 2, toBool, def->get_is_abstract, def->set_is_abstract); - treeController->AddFlagsFunctor( - [](const QModelIndex& ) + + classController->AddFlagsFunctor + ( + [](const QModelIndex& index) { Qt::ItemFlags result; - result |= Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable; + if(!(index.column() *in(1,4,5,6))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled | Qt::ItemIsSelectable; return result; } ); + } -void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, - QSharedPointer &interface, - QSharedPointer > &controller, - QSharedPointer &data, QWidget* originalView ,const char* slotName) +void QuickEdit::SetupOperationController(QSharedPointer > &) { - model = new TreeModel(); - SetupTreeController(controller); - - TreeItem* pointer = new TreeItem(0); - interface = QSharedPointer(pointer); - QList > items; - pointer->SetController(controller); - pointer->addChildren(items); +} - data = QSharedPointer(new BrowserNodeDummy(dummyView)); +void QuickEdit::SetupAttributeController(QSharedPointer > &) +{ +} - pointer->SetInternalData(data.data()); - controller->SetColumns(QStringList() << "class"); - model->InsertRootItem(interface); +void QuickEdit::SetupOperationAttributeController(QSharedPointer > &) +{ +} - 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 QuickEdit::SetupOperationReturnTypeController(QSharedPointer > &) +{ } void QuickEdit::Init(UmlWindow* window, BrowserView* view) { originalView = view; mainWindow = window; + validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, + UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; + SetupItemCreationFuncs(); + qRegisterMetaType>("QList"); + SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); + ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); + connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint))); + connect(ui->leSearch, SIGNAL(textChanged(QString)), this, SLOT(OnPerformFiltering(QString))); +} - connect(view, SIGNAL(selectionChanged(Q3ListViewItem *)), - this, SLOT(OnUpdateVisitedView(Q3ListViewItem *))); - connect(ui->leVisitedSearch, SIGNAL(textChanged(QString)), this, SLOT(OnPerformVisitedFiltering(QString))); +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 + 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; + QList items; + itemCreators[nodeType](rootInterface, node); + // we then assign items and all is ok + //rootInterface->AddChildren(items); + treeModel->InsertRootItem(rootInterface); - qRegisterMetaType>("QList"); - connect(view, SIGNAL(marked_list(QList)), this, SLOT(OnUpdateMarkedView(QList))); +} - 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 ))); +QSharedPointer QuickEdit::CreateInterfaceNode(QSharedPointer root, + QSharedPointer > controller, BrowserNode * node ) +{ + TreeItem* pointer = new TreeItem(0); + QSharedPointer interfaceItem(pointer); + pointer->SetController(controller); + pointer->SetInternalData(node); + pointer->SetParent(root); + return interfaceItem; +} + + +void QuickEdit::AssignItemsForClass(QSharedPointer root, BrowserNode * classNode) +{ + QSharedPointer interfaceItem = CreateInterfaceNode(root, classController, classNode); - dragDropFilter = new GenericEventFilter(this); - std::functionfavsFunc = 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))); + QList children = classNode->children(validTypes); + QList items; + for(BrowserNode* child : children) + { + if(!child) + continue; + UmlCode nodeType = child->get_type(); + itemCreators[nodeType](interfaceItem, child); + } + root->AddChildren(QList >() << interfaceItem); } -void QuickEdit::OnContextMenu(QPoint) +void QuickEdit::AssignItemsForOperation(QSharedPointer root, BrowserNode * node) { + QList> items; + QSharedPointer interfaceItem = CreateInterfaceNode(root, operationController, node); + BrowserOperation* operationNode = static_cast(node); + // first we make a dummy node for return type + QSharedPointer returnType(new BrowserOperationReturnType(dummyView, operationNode)); + QList > operationNodes; + operationNodes << returnType; + // next we make dummy nodes for all attributes + int paramCount = ((OperationData*)operationNode->get_data())->nparams; + items << CreateInterfaceNode(root, operationReturnTypeController, returnType.data()); + for(int i(0); i< paramCount; ++i) + { + ParamData* data = &((OperationData*)operationNode->get_data())->params[i]; + QSharedPointer param(new BrowserOperationAttribute(dummyView,operationNode,data)); + operationNodes << param; + items << CreateInterfaceNode(root, operationAttributeController, param.data()); + } + interfaceItem->AddChildren(items); + root->AddChildren(QList >() << interfaceItem); } diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 4cf594ee8..dcd30ddb4 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -6,6 +6,7 @@ #include #include #include "Libs/L_UniversalModels/include/ItemController.h" +#include "UmlEnum.h" namespace Ui { class QuickEdit; @@ -27,6 +28,7 @@ class QuickEdit : public QWidget explicit QuickEdit(QWidget *parent = 0); ~QuickEdit(); void Init(UmlWindow* window, BrowserView* view); + void Show(BrowserNode*); private: Ui::QuickEdit *ui = nullptr; @@ -34,27 +36,65 @@ class QuickEdit : public QWidget BrowserView* originalView = nullptr; UmlWindow* mainWindow = nullptr; QScopedPointer contextMenu; + QList validTypes; + QList > localNodeHolder; + QHash, BrowserNode*) > > itemCreators; // visited treeview - TreeModel* tmodVisited = nullptr; - bool isFilteredVisited = false; - QStringList expandedNodesVisited; - QSharedPointer rootVisitedInterface; - QSharedPointer > controllerVisited; - QSharedPointer rootVisited; + TreeModel* treeModel = nullptr; + bool isFiltered = false; + QStringList expandedNodes; + QSharedPointer rootInterface; + QSharedPointer modelRoot; + + QSharedPointer > classController; + QSharedPointer > operationController; + QSharedPointer > attributeController; + QSharedPointer > operationReturnTypeController; + QSharedPointer > operationAttributeController; + + QSharedPointer classInterface; + QSharedPointer operationInterface; + QSharedPointer attributeInterface; + QSharedPointer operationReturnTypeInterface; + QSharedPointer operationAttributeInterface; + + std::function classFlagFunctor; + std::function operationFlagFunctor; + std::function attributeFlagFunctor; + std::function operationReturnTypeFlagFunctor; + std::function operationAttributeFlagFunctor; void SetupTreeModel(TreeModel*& , QTreeView*, QSharedPointer&, QSharedPointer >&, - QSharedPointer&, QWidget *window, const char *); - void SetupTreeController(QSharedPointer >&); + QSharedPointer&); + + + void SetupClassController(QSharedPointer >&); + void SetupOperationController(QSharedPointer >&); + void SetupAttributeController(QSharedPointer >&); + void SetupOperationAttributeController(QSharedPointer >&); + void SetupOperationReturnTypeController(QSharedPointer >&); + + void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); QList > CreateCheckList(); void CreateMenu(); + void SetupItemCreationFuncs(); + + QSharedPointer CreateInterfaceNode(QSharedPointer root, QSharedPointer > controller, BrowserNode *node); + void AssignItemsForOperation(QSharedPointer root,BrowserNode*); + void AssignItemsForClass(QSharedPointer root,BrowserNode*); +// void AssignItemsForAttribute(QSharedPointer root,BrowserNode*); +// void AssignItemsForExternal(QSharedPointer root,BrowserNode*); +// void AssignItemsForAggregation(QSharedPointer root,BrowserNode*); + public slots: void OnContextMenu(QPoint); + //void OnPerformFiltering(QString); }; diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index 1bce559ab..25ff5e431 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 31 + revision 32 modified_by 42 "zeks" // class settings //class diagram settings @@ -1213,6 +1213,18 @@ ${inlines} 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 diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 91cca5aa9..6b8b4bf24 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,14 +4,15 @@ diagrams 1047 806 100 3 0 0 end show_stereotypes -selected -package_ref 129 // models +marked + operation_ref 2290602 // InternalPointer + class_ref 714922 // TreeItemInterface + operation_ref 2131626 // InternalPointer +end +selected operation_ref 2131626 // InternalPointer open - operation_ref 2277034 // get_flagsFunctors - operation_ref 2276906 // flags - operation_ref 2276778 // AddFlagsFunctor - attribute_ref 1307306 // previousRowCount - attribute_ref 1320362 // flagsFunctors + class_ref 714794 // TreeItem + class_ref 714922 // TreeItemInterface deploymentview_ref 227626 // classes end end diff --git a/src/Libs/L_UniversalModels/include/TreeItem.h b/src/Libs/L_UniversalModels/include/TreeItem.h index f0db934cb..be238e3d3 100644 --- a/src/Libs/L_UniversalModels/include/TreeItem.h +++ b/src/Libs/L_UniversalModels/include/TreeItem.h @@ -1,26 +1,3 @@ -// ************************************************************************* -// -// 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 _TREEITEM_H #define _TREEITEM_H @@ -88,6 +65,8 @@ typedef TreeItem value_type; void* InternalPointer(); + virtual void* InternalPointer() const; + virtual TreeItemInterface* child(int row); virtual TreeItemInterface* parent(); @@ -317,6 +296,14 @@ void* TreeItem::InternalPointer() // Bouml preserved body end 002086AA } +template +void* TreeItem::InternalPointer() const +{ + // Bouml preserved body begin 0022F42A + return m_data; + // Bouml preserved body end 0022F42A +} + template TreeItemInterface* TreeItem::child(int row) { diff --git a/src/Libs/L_UniversalModels/include/TreeItemInterface.h b/src/Libs/L_UniversalModels/include/TreeItemInterface.h index 7ab4e61de..37a4cfd6c 100644 --- a/src/Libs/L_UniversalModels/include/TreeItemInterface.h +++ b/src/Libs/L_UniversalModels/include/TreeItemInterface.h @@ -1,26 +1,3 @@ -// ************************************************************************* -// -// 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 _TREEITEMINTERFACE_H #define _TREEITEMINTERFACE_H @@ -70,6 +47,8 @@ class L_TREE_CONTROLLER_EXPORT TreeItemInterface virtual void* InternalPointer() = 0; + virtual void* InternalPointer() const = 0; + virtual TreeItemInterface* child(int row) = 0; virtual TreeItemInterface* parent() = 0; @@ -88,4 +67,5 @@ class L_TREE_CONTROLLER_EXPORT TreeItemInterface }; + #endif diff --git a/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp b/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp index 7358204d1..10d8ba754 100644 --- a/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp +++ b/src/Libs/L_UniversalModels/src/TreeItemInterface.cpp @@ -1,26 +1,4 @@ -// ************************************************************************* -// -// 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/TreeItemInterface.h" diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index e27421870..6bc014987 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -53,6 +53,7 @@ class BrowserClassDiagram; class BrowserClass : public BrowserNode, public Labeled { friend class StereotypesDialog; + friend class QuickEdit; protected: BrowserClass(int id); diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index d68fd1547..1cc53d548 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1313,6 +1313,23 @@ void BrowserNode::children(BrowserNodeList & nodes, } +QList BrowserNode::children(QList searchTypes) const +{ + QList items; + Q3ListViewItem * 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 && 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) { diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index 4913c9aef..3e8b01341 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -196,6 +196,7 @@ class BrowserNode : public Q3ListViewItem, void edit(const char *, const QStringList & default_stereotypes); void children(BrowserNodeList & nodes, UmlCode kind1, UmlCode kind2 = UmlRelations) const; + QList children(QList) const; virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const; QString fullname(bool rev) const; diff --git a/src/browser/BrowserOperation.h b/src/browser/BrowserOperation.h index ead594685..c5d3730fc 100644 --- a/src/browser/BrowserOperation.h +++ b/src/browser/BrowserOperation.h @@ -43,6 +43,7 @@ class BrowserClass; class BrowserOperation : public BrowserNode, public Labeled { friend class StereotypesDialog; + friend class BrowserOperationAttribute; protected: static IdDict all; diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp new file mode 100644 index 000000000..eb6a3fdef --- /dev/null +++ b/src/browser/BrowserOperationAttribute.cpp @@ -0,0 +1,120 @@ +#include "browser/BrowserOperationAttribute.h" +#include "BrowserView.h" +#include "BrowserClass.h" +#include "OperationData.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, ParamData* _data): BrowserNodeAbstractRemove(view), operation(_operation), data(_data) +{ + +} + +void BrowserOperationAttribute::set_name(QString value) +{ + data->set_name(value); +} + +QString BrowserOperationAttribute::get_name() const +{ + return data->get_name(); +} + +void BrowserOperationAttribute::set_direction(UmlParamDirection value) +{ + data->set_dir(value); +} + +UmlParamDirection BrowserOperationAttribute::get_direction() const +{ + return data->get_dir(); +} + +void BrowserOperationAttribute::set_param_type(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).stripWhiteSpace()); + + AType t; + if (!value.isEmpty()) + { + int rank = list.findIndex(value); + + if (rank != -1) + t.type = (BrowserClass *) nodes.at(rank); + else + t.explicit_type = value; + } + data->set_type(t); +} + +AType BrowserOperationAttribute::get_param_type() const +{ + return data->get_type(); +} + +void BrowserOperationAttribute::set_default_value(QString value) +{ + data->set_default_value(value); +} + +QString BrowserOperationAttribute::get_default_value() const +{ + return data->get_default_value(); +} + + +BrowserOperationReturnType::BrowserOperationReturnType(BrowserView* view, BrowserOperation* _operation): BrowserNodeAbstractRemove(view), operation(_operation) +{ + data = (OperationData*)operation->get_data(); +} + +void BrowserOperationReturnType::set_param_type(QString value) +{ + QStringList list; + BrowserNodeList nodes; + BrowserClass::instances(nodes); + nodes.full_names(list); + + AType t; + if (!value.isEmpty()) + { + int rank = list.findIndex(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) +{ +} diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h new file mode 100644 index 000000000..6bc3dfcce --- /dev/null +++ b/src/browser/BrowserOperationAttribute.h @@ -0,0 +1,54 @@ +#ifndef BROWSEROPERATIONATTRIBUTE_H +#define BROWSEROPERATIONATTRIBUTE_H +#include "BrowserNode.h" +#include "BrowserOperation.h" +#include "ParamData.h" +#include "Labeled.h" + +class BrowserView; + +class BrowserNodeAbstractRemove : public BrowserNode +{ + +protected: + BrowserNodeAbstractRemove(BrowserView* view); + virtual BrowserNode * duplicate(BrowserNode * , QString){return 0;} + virtual void prepare_update_lib() const {} + virtual void menu(){} + virtual void apply_shortcut(QString ){} + virtual UmlCode get_type() const {return UmlAssociation;} + virtual QString get_stype() const {return QString();} + virtual int get_identifier() const {return -1;} + virtual BasicData * get_data() const {return 0;} + virtual void save(QTextStream &, bool , QString & ){} + +}; + + +class BrowserOperationAttribute: public BrowserNodeAbstractRemove +{ + BrowserOperation* operation = nullptr; + ParamData* data = nullptr; +public: + BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, ParamData* _data); + void set_name(QString); + QString get_name() const; + void set_direction(UmlParamDirection); + UmlParamDirection get_direction() const; + void set_param_type(QString); + AType get_param_type() const; + void set_default_value(QString); + QString get_default_value() const; + +}; + +class BrowserOperationReturnType: public BrowserNodeAbstractRemove +{ + BrowserOperation* operation = nullptr; + OperationData* data; +public: + BrowserOperationReturnType(BrowserView* view, BrowserOperation* _operation); + void set_param_type(QString); + AType get_param_type() const; +}; +#endif // BROWSEROPERATIONATTRIBUTE_H diff --git a/src/data/AType.h b/src/data/AType.h index 977002e36..dbee97727 100644 --- a/src/data/AType.h +++ b/src/data/AType.h @@ -44,8 +44,10 @@ class AType BrowserClass * type = nullptr; public: - AType() : type(0) {}; + AType(){} const char * 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/ClassData.cpp b/src/data/ClassData.cpp index c3fa027fb..cc832395a 100644 --- a/src/data/ClassData.cpp +++ b/src/data/ClassData.cpp @@ -554,6 +554,11 @@ void ClassData::set_uml_visibility(UmlVisibility v) uml_visibility = v; } +void ClassData::set_uml_visibility(int v) +{ + uml_visibility = static_cast(v); +} + void ClassData::set_cpp_visibility(UmlVisibility v) { cpp_visibility = v; diff --git a/src/data/ClassData.h b/src/data/ClassData.h index 128714416..7de306679 100644 --- a/src/data/ClassData.h +++ b/src/data/ClassData.h @@ -49,6 +49,7 @@ class ClassData : public BasicData friend class ClassDialog; friend class ActualParamsTable; + //friend class QuickEdit; protected: WrapperStr constraint; @@ -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 { diff --git a/src/data/OperationData.h b/src/data/OperationData.h index 788d060b3..d4c45a4e7 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -45,7 +45,9 @@ class ExceptionData; class KeyValueData; class BrowserClass; class BrowserOperation; - +class BrowserOperationAttribute; +class BrowserOperationReturnType; +class QuickEdit; class OperationBody { public: @@ -62,6 +64,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 all; diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index e7f0720d4..95597e51f 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -3622,7 +3622,7 @@ void OperationDialog::python_default_def() } } - int index2; + int index2 = -1; if (((index = s.find("${(}") + 4) != (-1 + 4)) && ((index2 = s.find("${)}", index)) != -1)) { diff --git a/src/douml.pro b/src/douml.pro index aded296d0..6ec77012c 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -236,7 +236,8 @@ HEADERS = \ ui/catalogwidget.h \ browser/BrowserNodeDummy.h \ dialog/GenerationSettingsBuiltinTable.h \ - CustomWidgets/quickedit.h + CustomWidgets/quickedit.h \ + browser/BrowserOperationAttribute.h SOURCES = \ @@ -519,7 +520,8 @@ SOURCES = \ ui/catalogwidget.cpp \ browser/BrowserNodeDummy.cpp \ dialog/GenerationSettingsBuiltinTable.cpp \ - CustomWidgets/quickedit.cpp + CustomWidgets/quickedit.cpp \ + browser/BrowserOperationAttribute.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM From 034d2c199430fbb331c94f119a401c62e5c85ac2 Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 4 Mar 2013 01:25:16 +0400 Subject: [PATCH 042/297] non working core skeleton of new window proved to be feasible need to somehow extract & or * from function's declaration into the table and assign it back See functions CppParamsTable::update_edform() and CppParamsTable::extract --- src/CustomWidgets/quickedit.cpp | 159 ++++++++++++++++-- src/CustomWidgets/quickedit.h | 2 + .../include/ItemController.h | 14 +- src/browser/BrowserOperationAttribute.cpp | 19 ++- src/browser/BrowserOperationAttribute.h | 6 +- src/data/OperationData.cpp | 9 + src/data/OperationData.h | 1 + src/diagram/UmlWindow.cpp | 13 ++ src/diagram/UmlWindow.h | 5 + 9 files changed, 205 insertions(+), 23 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 21bdedd8b..7ec72ec3b 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -11,6 +11,7 @@ #include "browser/BrowserOperationAttribute.h" #include "browser/BrowserNodeDummy.h" #include "BrowserView.h" +#include "AType.h" #include "UmlEnum.h" #include "data/ClassData.h" #include "data/OperationData.h" @@ -28,6 +29,8 @@ QuickEdit::QuickEdit(QWidget *parent) : ui(new Ui::QuickEdit) { ui->setupUi(this); + if(!dummyView) + dummyView = new BrowserView(); } QuickEdit::~QuickEdit() @@ -55,6 +58,14 @@ void QuickEdit::OnContextMenu(QPoint point) contextMenu->popup(ui->tvEditor->mapToGlobal(point)); } +void QuickEdit::OnShow() +{ + BrowserNode* current = static_cast(originalView->currentItem()); + if(!current) + return; + Show(current); +} + void QuickEdit::CreateMenu() { @@ -103,13 +114,13 @@ void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, QSharedPointer &data) { model = new TreeModel(); - SetupClassController(controller); + TreeItem* pointer = new TreeItem(0); data = QSharedPointer(new BrowserNodeDummy(dummyView)); pointer->SetController(controller); pointer->SetInternalData(data.data()); - controller->SetColumns(QStringList() << "class"); + //controller->SetColumns(QStringList() << "class"); interface = QSharedPointer(pointer); model->InsertRootItem(interface); @@ -148,6 +159,7 @@ HOLDER->AddSetter(QPair(ROW,ROLE), \ ); + // some really insane code from stackoverflow that allows to shorten lengthy ifs template bool operator *(const T0& lhs, const std::array& rhs) { @@ -160,8 +172,12 @@ template std::array in(T0 arg0, T...arg void QuickEdit::SetupClassController(QSharedPointer > &) { - ADD_GETSET(BrowserClass, classController, 1, 0, toString, get_name, set_name); - ADD_GETSET(BrowserClass, classController, 1, 2, toString, get_name, set_name); + classController = QSharedPointer >( new ItemController()); + classController->SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + << "passagetype"); + ADD_GETSET(BrowserClass, classController, 0, 0, toString, get_name, set_name); + ADD_GETSET(BrowserClass, classController, 0, 2, toString, get_name, set_name); ADD_GETSET(BrowserClass, classController, 4, 0, toString, get_stereotype, def->set_stereotype); ADD_GETSET(BrowserClass, classController, 4, 2, toString, get_stereotype, def->set_stereotype); @@ -178,7 +194,7 @@ void QuickEdit::SetupClassController(QSharedPointer [](const QModelIndex& index) { Qt::ItemFlags result; - if(!(index.column() *in(1,4,5,6))) + if(!(index.column() *in(0,4,5,6))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -195,9 +211,76 @@ void QuickEdit::SetupClassController(QSharedPointer ); } +#define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLE,CONVERTER,ACCESSOR,SETTER) \ +HOLDER->AddGetter(QPair(ROW,ROLE), \ +[] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(((DATA_TYPE*)pointer->get_data())->ACCESSOR()); \ + else \ + return QVariant(); \ +} \ +); \ +HOLDER->AddSetter(QPair(ROW,ROLE), \ +[] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + ((DATA_TYPE*)pointer->get_data())->SETTER(value.CONVERTER()); \ + pointer->modified();\ + return true;\ +} \ +); void QuickEdit::SetupOperationController(QSharedPointer > &) { + operationController = QSharedPointer >( new ItemController()); + operationController->SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + << "passagetype"); + ADD_GETSET(BrowserOperation, operationController, 0, 0, toString, get_name, set_name); + ADD_GETSET(BrowserOperation, operationController, 0, 2, toString, get_name, set_name); + + ADD_GETSET(BrowserOperationReturnType, operationController, 2, 0, toString, + get_param_type().get_type, set_param_type); + ADD_GETSET(BrowserOperationReturnType, operationController, 2, 0, toString, + get_param_type().get_type, set_param_type); + + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 0, toInt, + get_cpp_visibility, set_cpp_visibility); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 0, toInt, + get_cpp_visibility, set_cpp_visibility); + + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 6, 0, toBool, + get_is_abstract, set_is_abstract); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 6, 2, toBool, + get_is_abstract, set_is_abstract); + + classController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + if(!(index.column() *in(0,2,5,6))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled | Qt::ItemIsSelectable; + return result; + } + ); } void QuickEdit::SetupAttributeController(QSharedPointer > &) @@ -206,6 +289,54 @@ void QuickEdit::SetupAttributeController(QSharedPointer > &) { + operationAttributeController = QSharedPointer >( new ItemController()); + operationAttributeController->SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + << "passagetype"); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 0, 0, toString, get_name, set_name); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 0, 2, toString, get_name, set_name); + + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 0, toString, + get_param_type().get_type, set_param_type); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 2, toString, + get_param_type().get_type, set_param_type); + + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 3, 0, toString, + get_default_value, set_default_value); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 3, 2, toString, + get_default_value, set_default_value); + + ADD_GETSET(BrowserOperationAttribute, operationController, 9, 0, toString, + get_direction, set_direction); + ADD_GETSET(BrowserOperationAttribute, operationController, 9, 2, toString, + get_direction, set_direction); + + ADD_GETSET(BrowserOperationAttribute, operationController, 10, 0, toString, + get_direction, set_direction); + ADD_GETSET(BrowserOperationAttribute, operationController, 10, 2, toString, + get_direction, set_direction); + + + classController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + if(!(index.column() *in(0,2,5,6))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled | Qt::ItemIsSelectable; + return result; + } + ); } void QuickEdit::SetupOperationReturnTypeController(QSharedPointer > &) @@ -216,10 +347,15 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) { originalView = view; mainWindow = window; - validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, - UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; + nullController = QSharedPointer > (new ItemController()); + //validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, +// UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; + validTypes = {UmlClass, UmlOperation}; + SetupItemCreationFuncs(); qRegisterMetaType>("QList"); + SetupClassController(classController); + SetupOperationController(operationController); SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint))); @@ -230,6 +366,7 @@ 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 + localNodeHolder.clear(); if(!node) return; UmlCode nodeType = node->get_type(); @@ -238,11 +375,11 @@ void QuickEdit::Show(BrowserNode * node) //next we need to recursively create items for node if(!itemCreators.contains(nodeType)) return; - QList items; itemCreators[nodeType](rootInterface, node); // we then assign items and all is ok //rootInterface->AddChildren(items); treeModel->InsertRootItem(rootInterface); + this->show(); } @@ -272,6 +409,7 @@ void QuickEdit::AssignItemsForClass(QSharedPointer root, Bro UmlCode nodeType = child->get_type(); itemCreators[nodeType](interfaceItem, child); } + //interfaceItem->AddChildren(items); root->AddChildren(QList >() << interfaceItem); } @@ -287,15 +425,16 @@ void QuickEdit::AssignItemsForOperation(QSharedPointer root, operationNodes << returnType; // next we make dummy nodes for all attributes int paramCount = ((OperationData*)operationNode->get_data())->nparams; - items << CreateInterfaceNode(root, operationReturnTypeController, returnType.data()); + items << CreateInterfaceNode(interfaceItem, nullController, returnType.data()); for(int i(0); i< paramCount; ++i) { ParamData* data = &((OperationData*)operationNode->get_data())->params[i]; QSharedPointer param(new BrowserOperationAttribute(dummyView,operationNode,data)); operationNodes << param; - items << CreateInterfaceNode(root, operationAttributeController, param.data()); + items << CreateInterfaceNode(interfaceItem, nullController, param.data()); } interfaceItem->AddChildren(items); root->AddChildren(QList >() << interfaceItem); + localNodeHolder.append(operationNodes); } diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index dcd30ddb4..dd8bb8cc6 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -47,6 +47,7 @@ class QuickEdit : public QWidget QSharedPointer rootInterface; QSharedPointer modelRoot; + QSharedPointer > nullController; QSharedPointer > classController; QSharedPointer > operationController; QSharedPointer > attributeController; @@ -94,6 +95,7 @@ class QuickEdit : public QWidget public slots: void OnContextMenu(QPoint); + void OnShow(); //void OnPerformFiltering(QString); }; diff --git a/src/Libs/L_UniversalModels/include/ItemController.h b/src/Libs/L_UniversalModels/include/ItemController.h index e93007f81..4508bc1ab 100644 --- a/src/Libs/L_UniversalModels/include/ItemController.h +++ b/src/Libs/L_UniversalModels/include/ItemController.h @@ -53,20 +53,20 @@ class ItemController Qt::ItemFlags flags(const QModelIndex & index) const; - static inline QVector > GetFlagsFunctors(); + inline QVector > GetFlagsFunctors(); - static void SetFlagsFunctors(QVector > value); + void SetFlagsFunctors(QVector > value); - static void AddFlagsFunctor(std::function functor); + void AddFlagsFunctor(std::function functor); - static void SetDefaultTreeFunctor(); + void SetDefaultTreeFunctor(); private: QStringList columns; QHash, std::function > getters; QHash, std::function > setters; - static QVector > flagsFunctors; + QVector > flagsFunctors; }; template inline QStringList ItemController::GetColumns() const @@ -170,6 +170,6 @@ void ItemController::SetDefaultTreeFunctor() // Bouml preserved body end 0021B1AA } -template -QVector > ItemController::flagsFunctors; +//template +//QVector > ItemController::flagsFunctors; #endif diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp index eb6a3fdef..e77cbb786 100644 --- a/src/browser/BrowserOperationAttribute.cpp +++ b/src/browser/BrowserOperationAttribute.cpp @@ -34,14 +34,16 @@ QString BrowserOperationAttribute::get_name() const return data->get_name(); } -void BrowserOperationAttribute::set_direction(UmlParamDirection value) +void BrowserOperationAttribute::set_direction(QString value) { - data->set_dir(value); + FIllDirList(); + UmlParamDirection dir = static_cast(DirList.indexOf(value)); + data->set_dir(dir); } -UmlParamDirection BrowserOperationAttribute::get_direction() const +QString BrowserOperationAttribute::get_direction() const { - return data->get_dir(); + return stringify(data->get_dir()); } void BrowserOperationAttribute::set_param_type(QString value) @@ -83,6 +85,15 @@ QString BrowserOperationAttribute::get_default_value() const return data->get_default_value(); } +void BrowserOperationAttribute::set_passage_type(QString) +{ +} + +QString BrowserOperationAttribute::get_passage_type() const +{ + return QString(); +} + BrowserOperationReturnType::BrowserOperationReturnType(BrowserView* view, BrowserOperation* _operation): BrowserNodeAbstractRemove(view), operation(_operation) { diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index 6bc3dfcce..8c8ca2a3b 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -33,12 +33,14 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, ParamData* _data); void set_name(QString); QString get_name() const; - void set_direction(UmlParamDirection); - UmlParamDirection get_direction() const; + void set_direction(QString); + QString get_direction() const; void set_param_type(QString); AType get_param_type() const; void set_default_value(QString); QString get_default_value() const; + void set_passage_type(QString); + QString get_passage_type() const; }; diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 748fbcb4c..4cf554b89 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -710,6 +710,10 @@ UmlVisibility OperationData::get_visibility(BrowserNode *) { return uml_visibility; } +//UmlVisibility OperationData::get_visibility() +//{ +// return uml_visibility; +//} void OperationData::set_is_abstract(bool yes) { @@ -4135,3 +4139,8 @@ bool PropagationEquality(const OperationData & origin, const OperationData & ano // 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(v); +} diff --git a/src/data/OperationData.h b/src/data/OperationData.h index d4c45a4e7..cf38c9348 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -254,6 +254,7 @@ class OperationData : public ClassMemberData, }; 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; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 0210e04dd..acd5056d6 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -108,6 +108,8 @@ #include "ui/catalogwidget.h" #include #include +#include +#include "CustomWidgets/quickedit.h" #include "Libs/L_UniversalModels/include/TreeItemInterface.h" static QString TemplateProject; @@ -480,12 +482,18 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) spl2 = new QSplitter(Qt::Vertical, spl1, "spl2"); wdgCatalog = new CatalogWidget; + quickEdit = new QuickEdit(); browser = new BrowserView(); 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); + sh1 = new QShortcut(QKeySequence(tr("1")),this, SLOT(OnShowQuickEdit()),SLOT(OnShowQuickEdit()), Qt::ApplicationShortcut); + + splTreeTab = new QSplitter(Qt::Vertical, spl1); splTreeTab->addWidget(browser); splTreeTab->addWidget(wdgCatalog); @@ -2387,6 +2395,11 @@ void UmlWindow::OnPickSelectionFromItem(const QModelIndex & current, const QMode itemAsNode->select_in_browser(); } +void UmlWindow::OnShowQuickEdit() +{ + quickEdit->OnShow(); +} + void UmlWindow::whats_this() const { QWhatsThis::enterWhatsThisMode(); diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index 252699fb8..f9d3e4d7c 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -51,6 +51,7 @@ class QToolButton; class BrowserView; class BrowserNode; class MultiLineEdit; +class QuickEdit; #include "UmlEnum.h" @@ -65,6 +66,7 @@ class TreeModel; class QLineEdit; class Q3ListViewItem; class CatalogWidget; +class QShortcut; class UmlWindow : public QMainWindow { Q_OBJECT @@ -84,6 +86,8 @@ class UmlWindow : public QMainWindow void PerformFiltering(); QList > CreateCheckList(); + QuickEdit* quickEdit = nullptr; + QShortcut* sh1; // end of perverted stuff MultiLineEdit * comment; BrowserNode * commented; // the commented object @@ -266,6 +270,7 @@ private slots: public slots: void whats_this() const; void OnPickSelectionFromItem(const QModelIndex&,const QModelIndex& ); + void OnShowQuickEdit(); }; From 1d85c28acfbd4be4e2bf9c63268479814919d9da Mon Sep 17 00:00:00 2001 From: zeks Date: Tue, 5 Mar 2013 21:12:22 +0400 Subject: [PATCH 043/297] . --- src/CustomWidgets/GenericDelegate.cpp | 83 +++++++ src/CustomWidgets/GenericDelegate.h | 34 +++ src/CustomWidgets/quickedit.cpp | 210 ++++++++++++------ src/CustomWidgets/quickedit.h | 7 +- .../L_UniversalModels/UML/models/42.session | 2 +- src/Libs/L_UniversalModels/src/TreeModel.cpp | 7 +- src/browser/BrowserOperationAttribute.h | 7 + src/data/ClassData.h | 3 + src/data/OperationData.h | 3 + src/data/ParamData.cpp | 2 +- src/data/ParamData.h | 4 +- src/douml.pro | 6 +- 12 files changed, 294 insertions(+), 74 deletions(-) create mode 100644 src/CustomWidgets/GenericDelegate.cpp create mode 100644 src/CustomWidgets/GenericDelegate.h diff --git a/src/CustomWidgets/GenericDelegate.cpp b/src/CustomWidgets/GenericDelegate.cpp new file mode 100644 index 000000000..df251f64e --- /dev/null +++ b/src/CustomWidgets/GenericDelegate.cpp @@ -0,0 +1,83 @@ +#include "GenericDelegate.h" +#include +#include +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) + : QStyledItemDelegate(parent) +{ +} +QWidget * GenericDelegate::createEditor(QWidget *parent, + const QStyleOptionViewItem &/* option */, + const QModelIndex &/* index */) const +{ + //return widgetCreator(parent); + return static_cast(0); +} + +void GenericDelegate::setEditorData(QWidget *editor, + const QModelIndex &index) const +{ + //dataAccessor(editor, index); +} +void GenericDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, + const QModelIndex &index) const +{ + //dataSetter(editor, model, index); +} + + +void GenericDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const +{ + if(!index.isValid()) + return; + + QVariant value = index.model()->data(index, Qt::DisplayRole); + + QStyleOptionViewItemV4 noSelectionOption(option); + initStyleOption(&noSelectionOption, index); + QFont font; + font.setWeight(0); + noSelectionOption.font = font; + ///QStyledItemDelegate::paint(painter, noSelectionOption, 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); + //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..4ffd182bc --- /dev/null +++ b/src/CustomWidgets/GenericDelegate.h @@ -0,0 +1,34 @@ +#ifndef GENERICDELEGATE_H +#define GENERICDELEGATE_H +#include +#include +class GenericDelegate : public QStyledItemDelegate +{ +public: + GenericDelegate(QObject *parent = 0); + + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, + const QModelIndex &index) const; + + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, + const QModelIndex &index) const override; + + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + bool editorEvent(QEvent *event, + QAbstractItemModel *model, + const QStyleOptionViewItem &option, + const QModelIndex &index) override; + + std::function dataAccessor; + std::function dataSetter; + std::function widgetCreator; + std::function editorEventProcessor; + +private: + + //std::function geometryUpdater; +}; + + +#endif // GENERICDELEGATE_H diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 7ec72ec3b..1cf238259 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -15,6 +15,7 @@ #include "UmlEnum.h" #include "data/ClassData.h" #include "data/OperationData.h" +#include "GenericDelegate.h" #include @@ -22,7 +23,48 @@ #include #include +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(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(event)->key() != Qt::Key_Space && + static_cast(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), @@ -126,7 +168,7 @@ void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, view->setModel(model); view->setContextMenuPolicy(Qt::CustomContextMenu); - view->setEditTriggers(QAbstractItemView::AllEditTriggers); + view->setEditTriggers(QAbstractItemView::DoubleClicked); view->setColumnWidth(0, 230); view->setExpandsOnDoubleClick(false); view->setRootIsDecorated(true); @@ -170,20 +212,52 @@ template std::array in(T0 arg0, T...arg return {{arg0, args...}}; } + +#define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLE,CONVERTER,ACCESSOR,SETTER) \ +HOLDER->AddGetter(QPair(ROW,ROLE), \ +[] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(((DATA_TYPE*)pointer->get_data())->ACCESSOR()); \ + else \ + return QVariant(); \ +} \ +); \ +HOLDER->AddSetter(QPair(ROW,ROLE), \ +[] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + ((DATA_TYPE*)pointer->get_data())->SETTER(value.CONVERTER()); \ + pointer->modified();\ + return true;\ +} \ +); + void QuickEdit::SetupClassController(QSharedPointer > &) { classController = QSharedPointer >( new ItemController()); - classController->SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" + classController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - << "passagetype"); + ); ADD_GETSET(BrowserClass, classController, 0, 0, toString, get_name, set_name); ADD_GETSET(BrowserClass, classController, 0, 2, toString, get_name, set_name); - ADD_GETSET(BrowserClass, classController, 4, 0, toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, 4, 2, toString, get_stereotype, def->set_stereotype); +// ADD_GETSET_DATA(BrowserOperation, ClassData, classController, 1, 0, toBool, +// cpp_is_external, set_cpp_is_external); +// ADD_GETSET_DATA(BrowserOperation, ClassData, classController, 1, 2, toBool, +// cpp_is_external, set_cpp_is_external); + + ADD_GETSET(BrowserClass, classController, 3, 0, toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserClass, classController, 3, 2, toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, 5, 0, toInt, def->get_uml_visibility, def->set_uml_visibility); - ADD_GETSET(BrowserClass, classController, 5, 2, toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, 4, 0, toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, 4, 2, toInt, def->get_uml_visibility, def->set_uml_visibility); ADD_GETSET(BrowserClass, classController, 6, 0, toBool, def->get_is_abstract, def->set_is_abstract); ADD_GETSET(BrowserClass, classController, 6, 2, toBool, def->get_is_abstract, def->set_is_abstract); @@ -194,7 +268,8 @@ void QuickEdit::SetupClassController(QSharedPointer [](const QModelIndex& index) { Qt::ItemFlags result; - if(!(index.column() *in(0,4,5,6))) + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(0,3,4,5))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -205,68 +280,50 @@ void QuickEdit::SetupClassController(QSharedPointer return result; if(pointer->is_writable()) result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled | Qt::ItemIsSelectable; + result |= Qt::ItemIsEnabled; return result; } ); } -#define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLE,CONVERTER,ACCESSOR,SETTER) \ -HOLDER->AddGetter(QPair(ROW,ROLE), \ -[] (const BrowserNode* data) \ -{ \ - if(!data)\ - return QVariant(); \ - const TYPE* pointer = static_cast(data);\ - if(pointer) \ - return QVariant(((DATA_TYPE*)pointer->get_data())->ACCESSOR()); \ - else \ - return QVariant(); \ -} \ -); \ -HOLDER->AddSetter(QPair(ROW,ROLE), \ -[] (BrowserNode* data, QVariant value) \ -{ \ - if(!data)\ - return false; \ - TYPE* pointer = static_cast(data);\ - if(pointer) \ - ((DATA_TYPE*)pointer->get_data())->SETTER(value.CONVERTER()); \ - pointer->modified();\ - return true;\ -} \ -); void QuickEdit::SetupOperationController(QSharedPointer > &) { operationController = QSharedPointer >( new ItemController()); - operationController->SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" + operationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - << "passagetype"); + ); ADD_GETSET(BrowserOperation, operationController, 0, 0, toString, get_name, set_name); ADD_GETSET(BrowserOperation, operationController, 0, 2, toString, get_name, set_name); - ADD_GETSET(BrowserOperationReturnType, operationController, 2, 0, toString, + ADD_GETSET(BrowserOperationReturnType, operationController, 1, 0, toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationReturnType, operationController, 2, 0, toString, + ADD_GETSET(BrowserOperationReturnType, operationController, 1, 2, toString, get_param_type().get_type, set_param_type); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 0, toInt, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 4, 0, toInt, get_cpp_visibility, set_cpp_visibility); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 0, toInt, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 4, 2, toInt, get_cpp_visibility, set_cpp_visibility); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 0, toBool, + get_isa_class_operation, set_isa_class_operation); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 2, toBool, + get_isa_class_operation, set_isa_class_operation); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 6, 0, toBool, get_is_abstract, set_is_abstract); ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 6, 2, toBool, get_is_abstract, set_is_abstract); - classController->AddFlagsFunctor + + operationController->AddFlagsFunctor ( [](const QModelIndex& index) { Qt::ItemFlags result; - if(!(index.column() *in(0,2,5,6))) + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(0,1,4,5,6))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -277,7 +334,7 @@ void QuickEdit::SetupOperationController(QSharedPointeris_writable()) result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled | Qt::ItemIsSelectable; + result |= Qt::ItemIsEnabled; return result; } ); @@ -290,39 +347,36 @@ void QuickEdit::SetupAttributeController(QSharedPointer > &) { operationAttributeController = QSharedPointer >( new ItemController()); - operationAttributeController->SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" + operationAttributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - << "passagetype"); + ); ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 0, 0, toString, get_name, set_name); ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 0, 2, toString, get_name, set_name); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 0, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 1, 0, toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 2, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 1, 2, toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 3, 0, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 0, toString, get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 3, 2, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 2, toString, get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationController, 9, 0, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 8, 0, toString, get_direction, set_direction); - ADD_GETSET(BrowserOperationAttribute, operationController, 9, 2, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 8, 2, toString, get_direction, set_direction); - ADD_GETSET(BrowserOperationAttribute, operationController, 10, 0, toString, - get_direction, set_direction); - ADD_GETSET(BrowserOperationAttribute, operationController, 10, 2, toString, - get_direction, set_direction); - classController->AddFlagsFunctor + operationAttributeController->AddFlagsFunctor ( [](const QModelIndex& index) { Qt::ItemFlags result; - if(!(index.column() *in(0,2,5,6))) + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(0,1,2,8))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -333,15 +387,15 @@ void QuickEdit::SetupOperationAttributeController(QSharedPointeris_writable()) result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled | Qt::ItemIsSelectable; + result |= Qt::ItemIsEnabled ; return result; } ); } -void QuickEdit::SetupOperationReturnTypeController(QSharedPointer > &) -{ -} +//void QuickEdit::SetupOperationReturnTypeController(QSharedPointer > &) +//{ +//} void QuickEdit::Init(UmlWindow* window, BrowserView* view) { @@ -356,9 +410,33 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) qRegisterMetaType>("QList"); SetupClassController(classController); SetupOperationController(operationController); + SetupOperationAttributeController(operationAttributeController); SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); - connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint))); +// >SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" +// << "visibility" << "static" << "abstract" << "multiplicity" << "direction" +// ); + GenericDelegate* checkboxDelegate = new GenericDelegate(ui->tvEditor); + //checkboxDelegate->widgetCreator = [](QWidget * parent) {return new QCheckBox(parent);}; +// checkboxDelegate->dataAccessor = [](QWidget * editor, const QModelIndex & index) +// { +// bool value = index.model()->data(index, Qt::EditRole).toBool(); +// QCheckBox *checkboxEdit = static_cast(editor); +// checkboxEdit->setChecked(value); +// }; +// checkboxDelegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) +// { +// QCheckBox * checkboxEdit = static_cast(editor); +// bool value = checkboxEdit->isChecked(); +// model->setData(index, value, Qt::EditRole); +// }; + checkboxDelegate->editorEventProcessor = editorEvent; + + ui->tvEditor->setItemDelegateForColumn(6, checkboxDelegate); + ui->tvEditor->setItemDelegateForColumn(5, checkboxDelegate); + //ui->tvEditor->setStyleSheet("QTreeView::item { border-right: 1px solid black }"); + ui->tvEditor->setAlternatingRowColors(true); + //connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint))); connect(ui->leSearch, SIGNAL(textChanged(QString)), this, SLOT(OnPerformFiltering(QString))); } @@ -366,6 +444,7 @@ 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; @@ -379,6 +458,9 @@ void QuickEdit::Show(BrowserNode * node) // we then assign items and all is ok //rootInterface->AddChildren(items); treeModel->InsertRootItem(rootInterface); + ui->tvEditor->resizeColumnToContents(0); + ui->tvEditor->resizeColumnToContents(1); + ui->tvEditor->resizeColumnToContents(2); this->show(); } @@ -425,14 +507,14 @@ void QuickEdit::AssignItemsForOperation(QSharedPointer root, operationNodes << returnType; // next we make dummy nodes for all attributes int paramCount = ((OperationData*)operationNode->get_data())->nparams; - items << CreateInterfaceNode(interfaceItem, nullController, returnType.data()); + //items << CreateInterfaceNode(interfaceItem, nullController, returnType.data()); for(int i(0); i< paramCount; ++i) { ParamData* data = &((OperationData*)operationNode->get_data())->params[i]; QSharedPointer param(new BrowserOperationAttribute(dummyView,operationNode,data)); operationNodes << param; - items << CreateInterfaceNode(interfaceItem, nullController, param.data()); + items << CreateInterfaceNode(interfaceItem, operationAttributeController, param.data()); } interfaceItem->AddChildren(items); root->AddChildren(QList >() << interfaceItem); diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index dd8bb8cc6..5247a67b5 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -3,7 +3,9 @@ #include #include +#include #include +#include #include #include "Libs/L_UniversalModels/include/ItemController.h" #include "UmlEnum.h" @@ -20,6 +22,9 @@ class Q3ListViewItem; class GenericEventFilter; class UmlWindow; + + + class QuickEdit : public QWidget { Q_OBJECT @@ -77,7 +82,7 @@ class QuickEdit : public QWidget void SetupOperationController(QSharedPointer >&); void SetupAttributeController(QSharedPointer >&); void SetupOperationAttributeController(QSharedPointer >&); - void SetupOperationReturnTypeController(QSharedPointer >&); + //void SetupOperationReturnTypeController(QSharedPointer >&); void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 6b8b4bf24..9c60b5e68 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -9,7 +9,7 @@ marked class_ref 714922 // TreeItemInterface operation_ref 2131626 // InternalPointer end -selected operation_ref 2131626 // InternalPointer +selected class_ref 714794 // TreeItem open class_ref 714794 // TreeItem class_ref 714922 // TreeItemInterface diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp index 2839fd331..69580e2cc 100644 --- a/src/Libs/L_UniversalModels/src/TreeModel.cpp +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -58,8 +58,8 @@ QVariant TreeModel::data(const QModelIndex & index, int role) const if(role == Qt::DisplayRole || role == Qt::EditRole) return item->data(index.column(),role); - if(role == Qt::DecorationRole ) - return item->data(index.column(),role); +// if(role == Qt::DecorationRole ) +// return item->data(index.column(),role); if(role == Qt::ForegroundRole) { if(index.sibling(index.row(), 14).data().toBool() == true) @@ -111,7 +111,8 @@ Qt::ItemFlags TreeModel::flags(const QModelIndex & index) const return 0; //Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable; - Qt::ItemFlags flags = rootItem->flags(index); + TreeItemInterface* iface = static_cast(index.internalPointer()); + Qt::ItemFlags flags = iface->flags(index); // if ( index.column() == 0 ) // flags |= Qt::ItemIsUserCheckable; diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index 8c8ca2a3b..31d016c05 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -41,6 +41,13 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove QString get_default_value() const; void set_passage_type(QString); QString get_passage_type() const; + bool is_writable() const + { + if(operation) + return operation->is_writable(); + return false; + } + void modified(){operation->package_modified();} }; diff --git a/src/data/ClassData.h b/src/data/ClassData.h index 7de306679..9b38e2868 100644 --- a/src/data/ClassData.h +++ b/src/data/ClassData.h @@ -184,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; diff --git a/src/data/OperationData.h b/src/data/OperationData.h index cf38c9348..eb3d77fc9 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -181,6 +181,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; diff --git a/src/data/ParamData.cpp b/src/data/ParamData.cpp index 79241698d..d8ccaa676 100644 --- a/src/data/ParamData.cpp +++ b/src/data/ParamData.cpp @@ -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(WrapperStr str) { default_value = str; } diff --git a/src/data/ParamData.h b/src/data/ParamData.h index c8b9dcfb8..b1a177ba5 100644 --- a/src/data/ParamData.h +++ b/src/data/ParamData.h @@ -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(WrapperStr s); QString definition(bool withdir, bool withname, ShowContextMode mode = noContext) const; diff --git a/src/douml.pro b/src/douml.pro index 6ec77012c..4f282a255 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -237,7 +237,8 @@ HEADERS = \ browser/BrowserNodeDummy.h \ dialog/GenerationSettingsBuiltinTable.h \ CustomWidgets/quickedit.h \ - browser/BrowserOperationAttribute.h + browser/BrowserOperationAttribute.h \ + CustomWidgets/GenericDelegate.h SOURCES = \ @@ -521,7 +522,8 @@ SOURCES = \ browser/BrowserNodeDummy.cpp \ dialog/GenerationSettingsBuiltinTable.cpp \ CustomWidgets/quickedit.cpp \ - browser/BrowserOperationAttribute.cpp + browser/BrowserOperationAttribute.cpp \ + CustomWidgets/GenericDelegate.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM From 784b685649b365049a2be3b7d0b0a65eee62e53a Mon Sep 17 00:00:00 2001 From: zeks Date: Wed, 6 Mar 2013 00:49:00 +0400 Subject: [PATCH 044/297] attribute seems to work in new control --- src/CustomWidgets/GenericDelegate.cpp | 13 +- src/CustomWidgets/GenericDelegate.h | 1 + src/CustomWidgets/quickedit.cpp | 164 ++++++++++++++++++-------- src/CustomWidgets/quickedit.h | 2 +- src/browser/BrowserAttribute.h | 1 + src/data/AType.cpp | 8 +- src/data/AType.h | 2 +- src/data/AttributeData.cpp | 25 ++++ src/data/AttributeData.h | 10 +- 9 files changed, 167 insertions(+), 59 deletions(-) diff --git a/src/CustomWidgets/GenericDelegate.cpp b/src/CustomWidgets/GenericDelegate.cpp index df251f64e..cd354032c 100644 --- a/src/CustomWidgets/GenericDelegate.cpp +++ b/src/CustomWidgets/GenericDelegate.cpp @@ -38,6 +38,11 @@ void GenericDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, //dataSetter(editor, model, index); } +QString GenericDelegate::displayText(const QVariant &value, const QLocale &locale) const +{ + return QString(); +} + void GenericDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { @@ -45,13 +50,7 @@ void GenericDelegate::paint(QPainter *painter, const QStyleOptionViewItem &optio return; QVariant value = index.model()->data(index, Qt::DisplayRole); - - QStyleOptionViewItemV4 noSelectionOption(option); - initStyleOption(&noSelectionOption, index); - QFont font; - font.setWeight(0); - noSelectionOption.font = font; - ///QStyledItemDelegate::paint(painter, noSelectionOption, index); + QStyledItemDelegate::paint(painter, option, index); if(!value.isValid()) { return; diff --git a/src/CustomWidgets/GenericDelegate.h b/src/CustomWidgets/GenericDelegate.h index 4ffd182bc..46935a633 100644 --- a/src/CustomWidgets/GenericDelegate.h +++ b/src/CustomWidgets/GenericDelegate.h @@ -13,6 +13,7 @@ class GenericDelegate : public QStyledItemDelegate void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; + QString displayText(const QVariant &value, const QLocale &locale) const; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; bool editorEvent(QEvent *event, diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 1cf238259..f6487a215 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -10,6 +10,8 @@ #include "browser/BrowserClass.h" #include "browser/BrowserOperationAttribute.h" #include "browser/BrowserNodeDummy.h" +#include "browser/BrowserAttribute.h" +#include "AttributeData.h" #include "BrowserView.h" #include "AType.h" #include "UmlEnum.h" @@ -23,6 +25,17 @@ #include #include +static const int nameIndex = 0; +static const int typeIndex = 1; +static const int defaultIndex = 2; +static const int stereotypeIndex = 3; +static const int visibilityIndex = 4; +static const int staticIndex = 5; +static const int abstractIndex = 6; +static const int multiplicityIndex = 7; +static const int directionIndex = 8; + + static QRect CheckBoxRect(const QStyleOptionViewItem &view_item_style_options) { QStyleOptionButton check_box_style_option; QRect check_box_rect = QApplication::style()->subElementRect( @@ -128,7 +141,7 @@ void QuickEdit::SetupItemCreationFuncs() //std::function<> itemCreators.insert(UmlClass, std::bind(&QuickEdit::AssignItemsForClass, this, std::placeholders::_1, std::placeholders::_2)); - //itemCreators.insert(UmlAttribute, std::bind(CreateItemsForAttribute, 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(UmlExtraMember, std::bind(CreateItemsForExternal, this, std::placeholders::_1, std::placeholders::_2)); } @@ -245,22 +258,22 @@ void QuickEdit::SetupClassController(QSharedPointer classController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" ); - ADD_GETSET(BrowserClass, classController, 0, 0, toString, get_name, set_name); - ADD_GETSET(BrowserClass, classController, 0, 2, toString, get_name, set_name); + ADD_GETSET(BrowserClass, classController, nameIndex, 0, toString, get_name, set_name); + ADD_GETSET(BrowserClass, classController, nameIndex, 2, toString, get_name, set_name); // ADD_GETSET_DATA(BrowserOperation, ClassData, classController, 1, 0, toBool, // cpp_is_external, set_cpp_is_external); // ADD_GETSET_DATA(BrowserOperation, ClassData, classController, 1, 2, toBool, // cpp_is_external, set_cpp_is_external); - ADD_GETSET(BrowserClass, classController, 3, 0, toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, 3, 2, toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserClass, classController, stereotypeIndex, 0, toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserClass, classController, stereotypeIndex, 2, toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, 4, 0, toInt, def->get_uml_visibility, def->set_uml_visibility); - ADD_GETSET(BrowserClass, classController, 4, 2, toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, visibilityIndex, 0, toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, visibilityIndex, 2, toInt, def->get_uml_visibility, def->set_uml_visibility); - ADD_GETSET(BrowserClass, classController, 6, 0, toBool, def->get_is_abstract, def->set_is_abstract); - ADD_GETSET(BrowserClass, classController, 6, 2, toBool, def->get_is_abstract, def->set_is_abstract); + ADD_GETSET(BrowserClass, classController, abstractIndex, 0, toBool, def->get_is_abstract, def->set_is_abstract); + ADD_GETSET(BrowserClass, classController, abstractIndex, 2, toBool, def->get_is_abstract, def->set_is_abstract); classController->AddFlagsFunctor @@ -269,7 +282,7 @@ void QuickEdit::SetupClassController(QSharedPointer { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(0,3,4,5))) + if(!(index.column() *in(nameIndex,stereotypeIndex,visibilityIndex,abstractIndex))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -293,27 +306,27 @@ void QuickEdit::SetupOperationController(QSharedPointerSetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" ); - ADD_GETSET(BrowserOperation, operationController, 0, 0, toString, get_name, set_name); - ADD_GETSET(BrowserOperation, operationController, 0, 2, toString, get_name, set_name); + ADD_GETSET(BrowserOperation, operationController, nameIndex, 0, toString, get_name, set_name); + ADD_GETSET(BrowserOperation, operationController, nameIndex, 2, toString, get_name, set_name); - ADD_GETSET(BrowserOperationReturnType, operationController, 1, 0, toString, + ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, 0, toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationReturnType, operationController, 1, 2, toString, + ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, 2, toString, get_param_type().get_type, set_param_type); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 4, 0, toInt, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, 0, toInt, get_cpp_visibility, set_cpp_visibility); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 4, 2, toInt, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, 2, toInt, get_cpp_visibility, set_cpp_visibility); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 0, toBool, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, 0, toBool, get_isa_class_operation, set_isa_class_operation); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 5, 2, toBool, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, 2, toBool, get_isa_class_operation, set_isa_class_operation); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 6, 0, toBool, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, 0, toBool, get_is_abstract, set_is_abstract); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, 6, 2, toBool, + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, 2, toBool, get_is_abstract, set_is_abstract); @@ -323,7 +336,7 @@ void QuickEdit::SetupOperationController(QSharedPointer(index.internalPointer()); @@ -342,6 +355,58 @@ void QuickEdit::SetupOperationController(QSharedPointer > &) { + attributeController = QSharedPointer >( new ItemController()); + attributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + ADD_GETSET(BrowserAttribute, attributeController, nameIndex, 0, toString, get_name, set_name); + ADD_GETSET(BrowserAttribute, attributeController, nameIndex, 2, toString, get_name, set_name); + + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, 0, toString, + get_type().get_type, set_type); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, 2, toString, + get_type().get_type, set_type); + + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, 0, toString, + get_init_value, set_init_value); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, 2, toString, + get_init_value, set_init_value); + + ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, 0, toString, + get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, 2, toString, + get_stereotype, def->set_stereotype); + + ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, 0, toInt, def->get_uml_visibility, def->set_visibility); + ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, 2, toInt, def->get_uml_visibility, def->set_visibility); + + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, 0, toBool, + get_isa_class_attribute, set_isa_class_attribute); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, 2, toBool, + get_isa_class_attribute, set_isa_class_attribute); + + + attributeController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,stereotypeIndex, visibilityIndex, staticIndex))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled ; + return result; + } + ); } void QuickEdit::SetupOperationAttributeController(QSharedPointer > &) @@ -350,22 +415,22 @@ void QuickEdit::SetupOperationAttributeController(QSharedPointerSetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" ); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 0, 0, toString, get_name, set_name); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 0, 2, toString, get_name, set_name); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, 0, toString, get_name, set_name); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, 2, toString, get_name, set_name); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 1, 0, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, 0, toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 1, 2, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, 2, toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 0, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, 0, toString, get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 2, 2, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, 2, toString, get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 8, 0, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, 0, toString, get_direction, set_direction); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, 8, 2, toString, + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, 2, toString, get_direction, set_direction); @@ -376,7 +441,7 @@ void QuickEdit::SetupOperationAttributeController(QSharedPointer(index.internalPointer()); @@ -404,32 +469,31 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) nullController = QSharedPointer > (new ItemController()); //validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, // UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; - validTypes = {UmlClass, UmlOperation}; + validTypes = {UmlClass, UmlOperation, UmlAttribute}; SetupItemCreationFuncs(); qRegisterMetaType>("QList"); SetupClassController(classController); SetupOperationController(operationController); + SetupAttributeController(attributeController); SetupOperationAttributeController(operationAttributeController); SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); -// >SetColumns(QStringList() << "name" << "external" << "type" << "default_value" << "stereotype" -// << "visibility" << "static" << "abstract" << "multiplicity" << "direction" -// ); + GenericDelegate* checkboxDelegate = new GenericDelegate(ui->tvEditor); - //checkboxDelegate->widgetCreator = [](QWidget * parent) {return new QCheckBox(parent);}; -// checkboxDelegate->dataAccessor = [](QWidget * editor, const QModelIndex & index) -// { -// bool value = index.model()->data(index, Qt::EditRole).toBool(); -// QCheckBox *checkboxEdit = static_cast(editor); -// checkboxEdit->setChecked(value); -// }; -// checkboxDelegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) -// { -// QCheckBox * checkboxEdit = static_cast(editor); -// bool value = checkboxEdit->isChecked(); -// model->setData(index, value, Qt::EditRole); -// }; + checkboxDelegate->widgetCreator = [](QWidget * parent) {return new QCheckBox(parent);}; + checkboxDelegate->dataAccessor = [](QWidget * editor, const QModelIndex & index) + { + bool value = index.model()->data(index, Qt::EditRole).toBool(); + QCheckBox *checkboxEdit = static_cast(editor); + checkboxEdit->setChecked(value); + }; + checkboxDelegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) + { + QCheckBox * checkboxEdit = static_cast(editor); + bool value = checkboxEdit->isChecked(); + model->setData(index, value, Qt::EditRole); + }; checkboxDelegate->editorEventProcessor = editorEvent; ui->tvEditor->setItemDelegateForColumn(6, checkboxDelegate); @@ -495,6 +559,12 @@ void QuickEdit::AssignItemsForClass(QSharedPointer root, Bro root->AddChildren(QList >() << interfaceItem); } +void QuickEdit::AssignItemsForAttribute(QSharedPointer root, BrowserNode * classNode) +{ + QSharedPointer interfaceItem = CreateInterfaceNode(root, attributeController, classNode); + root->AddChildren(QList >() << interfaceItem); +} + void QuickEdit::AssignItemsForOperation(QSharedPointer root, BrowserNode * node) { QList> items; diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 5247a67b5..2c53a04b7 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -94,7 +94,7 @@ class QuickEdit : public QWidget QSharedPointer CreateInterfaceNode(QSharedPointer root, QSharedPointer > controller, BrowserNode *node); void AssignItemsForOperation(QSharedPointer root,BrowserNode*); void AssignItemsForClass(QSharedPointer root,BrowserNode*); -// void AssignItemsForAttribute(QSharedPointer root,BrowserNode*); + void AssignItemsForAttribute(QSharedPointer root,BrowserNode*); // void AssignItemsForExternal(QSharedPointer root,BrowserNode*); // void AssignItemsForAggregation(QSharedPointer root,BrowserNode*); diff --git a/src/browser/BrowserAttribute.h b/src/browser/BrowserAttribute.h index 073a60d56..9d8adcdcc 100644 --- a/src/browser/BrowserAttribute.h +++ b/src/browser/BrowserAttribute.h @@ -43,6 +43,7 @@ class BrowserClass; class BrowserAttribute : public BrowserNode, public Labeled { friend class StereotypesDialog; + friend class QuickEdit; protected: static IdDict all; diff --git a/src/data/AType.cpp b/src/data/AType.cpp index 2a0e6bd77..9e0c745e2 100644 --- a/src/data/AType.cpp +++ b/src/data/AType.cpp @@ -36,9 +36,13 @@ #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 diff --git a/src/data/AType.h b/src/data/AType.h index dbee97727..9db997339 100644 --- a/src/data/AType.h +++ b/src/data/AType.h @@ -45,7 +45,7 @@ class AType public: AType(){} - const char * get_type() const; + 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; diff --git a/src/data/AttributeData.cpp b/src/data/AttributeData.cpp index ab2510c3d..cca6b7de8 100644 --- a/src/data/AttributeData.cpp +++ b/src/data/AttributeData.cpp @@ -306,6 +306,11 @@ void AttributeData::set_visibility(UmlVisibility v) uml_visibility = v; } +void AttributeData::set_visibility(int v) +{ + uml_visibility = static_cast(v); +} + void AttributeData::set_type(const AType & t) { if (type.type != t.type) { @@ -322,6 +327,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.findIndex(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()) { diff --git a/src/data/AttributeData.h b/src/data/AttributeData.h index e19eac46c..b45a72df6 100644 --- a/src/data/AttributeData.h +++ b/src/data/AttributeData.h @@ -113,6 +113,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; @@ -142,15 +145,20 @@ class AttributeData : public ClassMemberData 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; } From bd150df69de6dc4b62c533d48644edb969875b49 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 9 Mar 2013 14:27:53 +0400 Subject: [PATCH 045/297] . --- plugouts/cpp_utilities/42.session | 19 +++++++++++++++++-- src/CustomWidgets/quickedit.cpp | 10 ---------- src/CustomWidgets/quickedit.h | 5 ----- 3 files changed, 17 insertions(+), 17 deletions(-) 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/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index f6487a215..d019dc66e 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -261,11 +261,6 @@ void QuickEdit::SetupClassController(QSharedPointer ADD_GETSET(BrowserClass, classController, nameIndex, 0, toString, get_name, set_name); ADD_GETSET(BrowserClass, classController, nameIndex, 2, toString, get_name, set_name); -// ADD_GETSET_DATA(BrowserOperation, ClassData, classController, 1, 0, toBool, -// cpp_is_external, set_cpp_is_external); -// ADD_GETSET_DATA(BrowserOperation, ClassData, classController, 1, 2, toBool, -// cpp_is_external, set_cpp_is_external); - ADD_GETSET(BrowserClass, classController, stereotypeIndex, 0, toString, get_stereotype, def->set_stereotype); ADD_GETSET(BrowserClass, classController, stereotypeIndex, 2, toString, get_stereotype, def->set_stereotype); @@ -457,11 +452,6 @@ void QuickEdit::SetupOperationAttributeController(QSharedPointer > &) -//{ -//} - void QuickEdit::Init(UmlWindow* window, BrowserView* view) { originalView = view; diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 2c53a04b7..586d54905 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -22,9 +22,6 @@ class Q3ListViewItem; class GenericEventFilter; class UmlWindow; - - - class QuickEdit : public QWidget { Q_OBJECT @@ -82,8 +79,6 @@ class QuickEdit : public QWidget void SetupOperationController(QSharedPointer >&); void SetupAttributeController(QSharedPointer >&); void SetupOperationAttributeController(QSharedPointer >&); - //void SetupOperationReturnTypeController(QSharedPointer >&); - void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); QList > CreateCheckList(); From 0797e939c79115f36beff05657ad3ceaa87b57a4 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 9 Mar 2013 16:52:01 +0400 Subject: [PATCH 046/297] taught new control to handle relations the added code is crap and subject to eradication --- src/CustomWidgets/quickedit.cpp | 258 ++++++++++++------ src/CustomWidgets/quickedit.h | 5 +- src/Libs/L_UniversalModels/UML/models/201002 | 61 ++++- .../L_UniversalModels/UML/models/42.session | 8 +- .../include/ItemController.h | 42 ++- src/browser/BrowserClass.cpp | 3 +- src/browser/BrowserRelation.h | 1 + src/data/RelationData.cpp | 68 +++-- src/data/RelationData.h | 18 +- 9 files changed, 330 insertions(+), 134 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index d019dc66e..37b3295d1 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -11,12 +11,14 @@ #include "browser/BrowserOperationAttribute.h" #include "browser/BrowserNodeDummy.h" #include "browser/BrowserAttribute.h" +#include "browser/BrowserRelation.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" @@ -143,6 +145,10 @@ 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(CreateItemsForExternal, this, std::placeholders::_1, std::placeholders::_2)); } @@ -187,8 +193,8 @@ void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, view->setRootIsDecorated(true); } -#define ADD_GETSET(TYPE,HOLDER,ROW,ROLE,CONVERTER,ACCESSOR,SETTER) \ -HOLDER->AddGetter(QPair(ROW,ROLE), \ +#define ADD_GETSET(TYPE,HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ +HOLDER->AddGetter(ROW,ROLES, \ [] (const BrowserNode* data) \ { \ if(!data)\ @@ -200,7 +206,7 @@ HOLDER->AddGetter(QPair(ROW,ROLE), \ return QVariant(); \ } \ ); \ -HOLDER->AddSetter(QPair(ROW,ROLE), \ +HOLDER->AddSetter(ROW,ROLES, \ [] (BrowserNode* data, QVariant value) \ { \ if(!data)\ @@ -213,6 +219,58 @@ HOLDER->AddSetter(QPair(ROW,ROLE), \ } \ ); +#define ADD_GETSET_DIRECT(TYPE,HOLDER,ROW,ROLES,CONVERTER,PARAM) \ +HOLDER->AddGetter(ROW,ROLES, \ +[] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(pointer->PARAM); \ + else \ + return QVariant(); \ +} \ +); \ +HOLDER->AddSetter(ROW,ROLES, \ +[] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + pointer->PARAM = value.CONVERTER(); \ + pointer->modified();\ + return true;\ +} \ +); + +#define ADD_GETSET_DIRECT_ASSIGNMENT(TYPE,HOLDER,ROW,ROLES,PARAM, ASSIGNSTRING) \ +HOLDER->AddGetter(ROW,ROLES, \ +[] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(pointer->PARAM); \ + else \ + return QVariant(); \ +} \ +); \ +HOLDER->AddSetter(ROW,ROLES, \ +[] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + pointer->PARAM = ASSIGNSTRING;\ + pointer->modified();\ + return true;\ +} \ +); + // some really insane code from stackoverflow that allows to shorten lengthy ifs @@ -226,8 +284,8 @@ template std::array in(T0 arg0, T...arg } -#define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLE,CONVERTER,ACCESSOR,SETTER) \ -HOLDER->AddGetter(QPair(ROW,ROLE), \ +#define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ +HOLDER->AddGetter(ROW,ROLES, \ [] (const BrowserNode* data) \ { \ if(!data)\ @@ -239,7 +297,7 @@ HOLDER->AddGetter(QPair(ROW,ROLE), \ return QVariant(); \ } \ ); \ -HOLDER->AddSetter(QPair(ROW,ROLE), \ +HOLDER->AddSetter(ROW,ROLES, \ [] (BrowserNode* data, QVariant value) \ { \ if(!data)\ @@ -258,17 +316,14 @@ void QuickEdit::SetupClassController(QSharedPointer classController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" ); - ADD_GETSET(BrowserClass, classController, nameIndex, 0, toString, get_name, set_name); - ADD_GETSET(BrowserClass, classController, nameIndex, 2, toString, get_name, set_name); - - ADD_GETSET(BrowserClass, classController, stereotypeIndex, 0, toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, stereotypeIndex, 2, toString, get_stereotype, def->set_stereotype); - - ADD_GETSET(BrowserClass, classController, visibilityIndex, 0, toInt, def->get_uml_visibility, def->set_uml_visibility); - ADD_GETSET(BrowserClass, classController, visibilityIndex, 2, toInt, def->get_uml_visibility, def->set_uml_visibility); - - ADD_GETSET(BrowserClass, classController, abstractIndex, 0, toBool, def->get_is_abstract, def->set_is_abstract); - ADD_GETSET(BrowserClass, classController, abstractIndex, 2, toBool, def->get_is_abstract, def->set_is_abstract); + ADD_GETSET(BrowserClass, classController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, def->get_is_abstract, def->set_is_abstract); classController->AddFlagsFunctor @@ -301,28 +356,16 @@ void QuickEdit::SetupOperationController(QSharedPointerSetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" ); - ADD_GETSET(BrowserOperation, operationController, nameIndex, 0, toString, get_name, set_name); - ADD_GETSET(BrowserOperation, operationController, nameIndex, 2, toString, get_name, set_name); - - ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, 0, toString, - get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, 2, toString, - get_param_type().get_type, set_param_type); - - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, 0, toInt, - get_cpp_visibility, set_cpp_visibility); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, 2, toInt, - get_cpp_visibility, set_cpp_visibility); - - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, 0, toBool, - get_isa_class_operation, set_isa_class_operation); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, 2, toBool, - get_isa_class_operation, set_isa_class_operation); - - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, 0, toBool, - get_is_abstract, set_is_abstract); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, 2, toBool, - get_is_abstract, set_is_abstract); + ADD_GETSET(BrowserOperation, operationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_param_type().get_type, set_param_type); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toInt, get_cpp_visibility, set_cpp_visibility); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_isa_class_operation, set_isa_class_operation); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_is_abstract, set_is_abstract); operationController->AddFlagsFunctor @@ -354,31 +397,19 @@ void QuickEdit::SetupAttributeController(QSharedPointerSetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" ); - ADD_GETSET(BrowserAttribute, attributeController, nameIndex, 0, toString, get_name, set_name); - ADD_GETSET(BrowserAttribute, attributeController, nameIndex, 2, toString, get_name, set_name); - - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, 0, toString, - get_type().get_type, set_type); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, 2, toString, - get_type().get_type, set_type); - - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, 0, toString, - get_init_value, set_init_value); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, 2, toString, - get_init_value, set_init_value); + ADD_GETSET(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_type().get_type, set_type); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_init_value, set_init_value); + ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toInt, def->get_uml_visibility, def->set_visibility); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_isa_class_attribute, set_isa_class_attribute); - ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, 0, toString, - get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, 2, toString, - get_stereotype, def->set_stereotype); - - ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, 0, toInt, def->get_uml_visibility, def->set_visibility); - ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, 2, toInt, def->get_uml_visibility, def->set_visibility); - - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, 0, toBool, - get_isa_class_attribute, set_isa_class_attribute); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, 2, toBool, - get_isa_class_attribute, set_isa_class_attribute); attributeController->AddFlagsFunctor @@ -410,27 +441,85 @@ void QuickEdit::SetupOperationAttributeController(QSharedPointerSetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" ); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, 0, toString, get_name, set_name); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, 2, toString, get_name, set_name); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_param_type().get_type, set_param_type); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_default_value, set_default_value); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_direction, set_direction); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, 0, toString, - get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, 2, toString, - get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, 0, toString, - get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, 2, toString, - get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, 0, toString, - get_direction, set_direction); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, 2, toString, - get_direction, set_direction); + operationAttributeController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,visibilityIndex))) + return result; + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled ; + return result; + } + ); +} - operationAttributeController->AddFlagsFunctor +void QuickEdit::SetupRelationController(QSharedPointer > &) +{ + relationController = QSharedPointer >( new ItemController()); + relationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + + ADD_GETSET(BrowserRelation, relationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET_DIRECT(BrowserRelation, relationController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, def->a.init_value.operator QString()); + ADD_GETSET_DIRECT_ASSIGNMENT(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + def->a.uml_visibility, static_cast(value.toInt())); + ADD_GETSET_DIRECT(BrowserRelation, relationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, def->a.isa_class_relation); + ADD_GETSET_DIRECT(BrowserRelation, relationController, multiplicityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, def->a.multiplicity.operator QString()); + + relationController->AddGetter(typeIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data) + { + if(!data) + return QVariant(); + const BrowserRelation* pointer = static_cast(data); + if(pointer) + return QVariant(pointer->def->get_end_class()->get_name()); + else + return QVariant(); + } + ); + relationController->AddSetter(1,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (BrowserNode* data, QVariant value) + { + if(!data) + return false; + BrowserRelation* pointer = static_cast(data); + if(pointer) + pointer->def->get_end_class()->set_name(value.toString()); + pointer->modified(); + return true; + }); + + + relationController->AddFlagsFunctor ( [](const QModelIndex& index) { @@ -452,6 +541,7 @@ void QuickEdit::SetupOperationAttributeController(QSharedPointer > (new ItemController()); //validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, // UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; - validTypes = {UmlClass, UmlOperation, UmlAttribute}; + validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, + UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation}; + //validTypes = {UmlClass, UmlOperation, UmlAttribute}; SetupItemCreationFuncs(); qRegisterMetaType>("QList"); @@ -467,6 +559,7 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) SetupOperationController(operationController); SetupAttributeController(attributeController); SetupOperationAttributeController(operationAttributeController); + SetupRelationController(relationController); SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); @@ -545,7 +638,6 @@ void QuickEdit::AssignItemsForClass(QSharedPointer root, Bro UmlCode nodeType = child->get_type(); itemCreators[nodeType](interfaceItem, child); } - //interfaceItem->AddChildren(items); root->AddChildren(QList >() << interfaceItem); } @@ -555,6 +647,12 @@ void QuickEdit::AssignItemsForAttribute(QSharedPointer root, root->AddChildren(QList >() << interfaceItem); } +void QuickEdit::AssignItemsForRelation(QSharedPointer root, BrowserNode * classNode) +{ + QSharedPointer interfaceItem = CreateInterfaceNode(root, relationController, classNode); + root->AddChildren(QList >() << interfaceItem); +} + void QuickEdit::AssignItemsForOperation(QSharedPointer root, BrowserNode * node) { QList> items; diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 586d54905..319138f83 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -55,12 +55,14 @@ class QuickEdit : public QWidget QSharedPointer > attributeController; QSharedPointer > operationReturnTypeController; QSharedPointer > operationAttributeController; + QSharedPointer > relationController; QSharedPointer classInterface; QSharedPointer operationInterface; QSharedPointer attributeInterface; QSharedPointer operationReturnTypeInterface; QSharedPointer operationAttributeInterface; + QSharedPointer relationInterface; std::function classFlagFunctor; std::function operationFlagFunctor; @@ -79,7 +81,7 @@ class QuickEdit : public QWidget void SetupOperationController(QSharedPointer >&); void SetupAttributeController(QSharedPointer >&); void SetupOperationAttributeController(QSharedPointer >&); - + void SetupRelationController(QSharedPointer > &); void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); QList > CreateCheckList(); void CreateMenu(); @@ -90,6 +92,7 @@ class QuickEdit : public QWidget void AssignItemsForOperation(QSharedPointer root,BrowserNode*); void AssignItemsForClass(QSharedPointer root,BrowserNode*); void AssignItemsForAttribute(QSharedPointer root,BrowserNode*); + void AssignItemsForRelation(QSharedPointer root, BrowserNode * classNode); // void AssignItemsForExternal(QSharedPointer root,BrowserNode*); // void AssignItemsForAggregation(QSharedPointer root,BrowserNode*); diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index 25ff5e431..5f1caa944 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 32 + revision 33 modified_by 42 "zeks" // class settings //class diagram settings @@ -839,6 +839,27 @@ ${inlines} 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" + param inout name "function" explicit_type "std::function" + 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 @@ -859,6 +880,27 @@ ${inlines} 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" + param inout name "function" explicit_type "std::function" + 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 2207658 "flags" preserve_cpp_body_indent const public explicit_return_type "Qt::ItemFlags" nparams 1 @@ -879,10 +921,10 @@ ${inlines} end operation 2207786 "get_flagsFunctors" - class_operation force_body_gen cpp_inline public explicit_return_type "QVector >" + force_body_gen cpp_inline public explicit_return_type "QVector >" nparams 0 - cpp_decl " ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}; + cpp_decl " ${comment}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${throw}; " cpp_def "${description}${inline}${type} ${class}::${name}${(}${)}${const}${volatile}${staticnl} { @@ -905,11 +947,11 @@ ${inlines} end operation 2207914 "set_flagsFunctors" - class_operation force_body_gen public explicit_return_type "void" + force_body_gen public explicit_return_type "void" nparams 1 param in name "value" explicit_type "QVector >" - cpp_decl " ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${)}${const}${volatile}; + 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} { @@ -932,7 +974,7 @@ ${inlines} end operation 2208298 "AddFlagsFunctor" - class_operation preserve_cpp_body_indent public explicit_return_type "void" + preserve_cpp_body_indent public explicit_return_type "void" nparams 1 param inout name "functor" explicit_type "std::function" @@ -951,7 +993,7 @@ ${inlines} end operation 2208170 "SetDefaultTreeFunctor" - class_operation preserve_cpp_body_indent public explicit_return_type "void" + preserve_cpp_body_indent public explicit_return_type "void" nparams 0 cpp_decl " ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${)}${const}${volatile}${abstract}; @@ -998,7 +1040,7 @@ ${inlines} end attribute 1294122 "flagsFunctors" - class_attribute private explicit_type "QVector >" + private explicit_type "QVector >" cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" java_decl " ${comment}${@}${visibility}${static}${final}${transient}${volatile}${type} ${name}${value}; " @@ -2832,7 +2874,8 @@ ${namespace_end} artifact 613034 "ItemController" stereotype "source" - cpp_h "#ifndef ${NAMESPACE}_${NAME}_H + cpp_h "@{copyright} +#ifndef ${NAMESPACE}_${NAME}_H #define ${NAMESPACE}_${NAME}_H ${description} diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index 9c60b5e68..b8c3b2a02 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,14 +4,8 @@ diagrams 1047 806 100 3 0 0 end show_stereotypes -marked - operation_ref 2290602 // InternalPointer - class_ref 714922 // TreeItemInterface - operation_ref 2131626 // InternalPointer -end -selected class_ref 714794 // TreeItem +selected artifact_ref 613034 // ItemController open - class_ref 714794 // TreeItem class_ref 714922 // TreeItemInterface deploymentview_ref 227626 // classes end diff --git a/src/Libs/L_UniversalModels/include/ItemController.h b/src/Libs/L_UniversalModels/include/ItemController.h index 4508bc1ab..fd1859414 100644 --- a/src/Libs/L_UniversalModels/include/ItemController.h +++ b/src/Libs/L_UniversalModels/include/ItemController.h @@ -27,8 +27,8 @@ #include #include -#include #include +#include #include #include "l_tree_controller_global.h" @@ -49,8 +49,12 @@ class ItemController void AddGetter(const QPair & index, std::function function); + void AddGetter(int row, const QVector & roles, std::function function); + void AddSetter(const QPair & index, std::function function); + void AddSetter(int row, const QVector & roles, std::function function); + Qt::ItemFlags flags(const QModelIndex & index) const; inline QVector > GetFlagsFunctors(); @@ -110,6 +114,17 @@ void ItemController::AddGetter(const QPair & index, std::function +void ItemController::AddGetter(int row, const QVector & roles, std::function function) +{ + // Bouml preserved body begin 00230DAA + for(int role : roles) + { + AddGetter(QPair(row, role), function); + } + // Bouml preserved body end 00230DAA +} + template void ItemController::AddSetter(const QPair & index, std::function function) { @@ -118,6 +133,17 @@ void ItemController::AddSetter(const QPair & index, std::function +void ItemController::AddSetter(int row, const QVector & roles, std::function function) +{ + // Bouml preserved body begin 00230D2A + for(int role : roles) + { + AddSetter(QPair(row, role), function); + } + // Bouml preserved body end 00230D2A +} + template Qt::ItemFlags ItemController::flags(const QModelIndex & index) const { @@ -132,22 +158,19 @@ Qt::ItemFlags ItemController::flags(const QModelIndex & index) const } template -inline QVector > ItemController::GetFlagsFunctors() - +inline QVector > ItemController::GetFlagsFunctors() { return flagsFunctors; } template -void ItemController::SetFlagsFunctors(QVector > value) - +void ItemController::SetFlagsFunctors(QVector > value) { flagsFunctors = value; } template -void ItemController::AddFlagsFunctor(std::function functor) - +void ItemController::AddFlagsFunctor(std::function functor) { // Bouml preserved body begin 0021B22A flagsFunctors.append(functor); @@ -155,8 +178,7 @@ void ItemController::AddFlagsFunctor(std::function -void ItemController::SetDefaultTreeFunctor() - +void ItemController::SetDefaultTreeFunctor() { // Bouml preserved body begin 0021B1AA AddFlagsFunctor([](const QModelIndex& index) @@ -170,6 +192,4 @@ void ItemController::SetDefaultTreeFunctor() // Bouml preserved body end 0021B1AA } -//template -//QVector > ItemController::flagsFunctors; #endif diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index aef1a36ea..3ee6c5f1d 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1484,7 +1484,8 @@ QString BrowserClass::may_connect(UmlCode l, BrowserClass * other) 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); diff --git a/src/browser/BrowserRelation.h b/src/browser/BrowserRelation.h index a256511d7..9e43c6f11 100644 --- a/src/browser/BrowserRelation.h +++ b/src/browser/BrowserRelation.h @@ -44,6 +44,7 @@ class BrowserOperation; class BrowserRelation : public BrowserNode, public Labeled { +friend class QuickEdit; protected: static IdDict all; diff --git a/src/data/RelationData.cpp b/src/data/RelationData.cpp index 228ae7030..e5c1ecc9f 100644 --- a/src/data/RelationData.cpp +++ b/src/data/RelationData.cpp @@ -75,7 +75,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,18 +97,18 @@ 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()) + SetEnd(new BrowserRelation((md->get_end_class() == (BrowserClass *) model->parent()) ? (BrowserClass *) r->parent() : md->get_end_class(), - this); + 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; connect(end_removed_from->get_data(), SIGNAL(deleted()), @@ -116,10 +117,10 @@ RelationData::RelationData(const BrowserRelation * model, } 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,7 +149,7 @@ 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 @@ -158,7 +159,7 @@ void RelationData::garbage(BrowserRelation * r) // end -> start read, but start -> end not read delete this; else { - end = 0; + SetEnd(0); if (start == 0) delete this; @@ -286,10 +287,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())); @@ -525,7 +525,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())); } @@ -536,7 +536,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(); } @@ -1428,8 +1428,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)); } } @@ -1684,13 +1684,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); @@ -1713,7 +1713,7 @@ RelationData * RelationData::read(char *& st, char *& k, ((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) { @@ -1786,8 +1786,8 @@ void RelationData::delete_unconsistent() while (! Unconsistent.isEmpty()) { RelationData * d = Unconsistent.take(0); - d->start = d->end = 0; - + d->SetStart(0); + d->SetEnd(0); if (!d->deletedp()) d->BasicData::delete_it(); @@ -1809,3 +1809,25 @@ void RelationData::post_load() rd->a.cpp_decl = "#include in header"; } } + +void RelationData::IndexStartEnd() +{ + dataForClass.clear(); + if(start && start->parent()) + 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; + IndexStartEnd(); +} + +void RelationData::SetEnd(BrowserRelation * relEnd) +{ + end = relEnd; + IndexStartEnd(); +} diff --git a/src/data/RelationData.h b/src/data/RelationData.h index 3c7b24bf1..dde1d137c 100644 --- a/src/data/RelationData.h +++ b/src/data/RelationData.h @@ -36,6 +36,7 @@ //Added by qt3to4: #include +#include class QTextStream; @@ -89,6 +90,7 @@ class RelationData : public ClassMemberData, public Labeled Q_OBJECT friend class RelationDialog; + friend class QuickEdit; protected: static IdDict all; @@ -101,12 +103,14 @@ class RelationData : public ClassMemberData, public Labeled 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 dataForClass; + 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,6 +122,16 @@ class RelationData : public ClassMemberData, public Labeled RelationData(UmlCode e, int id = 0); RelationData(const BrowserRelation * model, BrowserRelation * r); virtual ~RelationData(); + void IndexStartEnd(); + + void SetStart(BrowserRelation*); + void SetEnd(BrowserRelation*); + RoleData* GetDataForClass(QString node) + { + if(dataForClass.contains(node)) + return dataForClass[node]; + } + void garbage(BrowserRelation * r); void copy(RelationData * model); From fc3ced110be887593f7879e33a58a93a3907b978 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 9 Mar 2013 22:18:17 +0400 Subject: [PATCH 047/297] Made quick edit understand extra nodes. Generic event filter is now actually generic moved code around a bit --- src/CustomWidgets/GenericDelegate.cpp | 45 +- src/CustomWidgets/GenericDelegate.h | 6 +- src/CustomWidgets/quickedit.cpp | 548 ++++-------------- src/CustomWidgets/quickedit.h | 21 +- .../quickeditcontrollersetup.cpp | 432 ++++++++++++++ src/browser/BrowserOperationAttribute.h | 5 + src/douml.pro | 3 +- 7 files changed, 592 insertions(+), 468 deletions(-) create mode 100644 src/CustomWidgets/quickeditcontrollersetup.cpp diff --git a/src/CustomWidgets/GenericDelegate.cpp b/src/CustomWidgets/GenericDelegate.cpp index cd354032c..7f7c4a2a4 100644 --- a/src/CustomWidgets/GenericDelegate.cpp +++ b/src/CustomWidgets/GenericDelegate.cpp @@ -15,62 +15,47 @@ static QRect CheckBoxRect(const QStyleOptionViewItem &view_item_style_options) { return QRect(check_box_point, check_box_rect.size()); } -GenericDelegate::GenericDelegate(QObject *parent) - : QStyledItemDelegate(parent) +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); - return static_cast(0); + return widgetCreator(parent); } void GenericDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const { - //dataAccessor(editor, index); + if(dataAccessor) + dataAccessor(editor, index); } void GenericDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const { - //dataSetter(editor, model, index); + if(dataSetter) + dataSetter(editor, model, index); } QString GenericDelegate::displayText(const QVariant &value, const QLocale &locale) const { - return QString(); + 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; - - QVariant value = index.model()->data(index, Qt::DisplayRole); - 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); - //QStyledItemDelegate::paint(painter, option, index); + 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) diff --git a/src/CustomWidgets/GenericDelegate.h b/src/CustomWidgets/GenericDelegate.h index 46935a633..f3e8934b9 100644 --- a/src/CustomWidgets/GenericDelegate.h +++ b/src/CustomWidgets/GenericDelegate.h @@ -5,7 +5,7 @@ class GenericDelegate : public QStyledItemDelegate { public: - GenericDelegate(QObject *parent = 0); + GenericDelegate(QObject *parent = 0, bool _hideText = false); QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; @@ -24,7 +24,9 @@ class GenericDelegate : public QStyledItemDelegate std::function dataAccessor; std::function dataSetter; std::function widgetCreator; + std::function paintProcessor; std::function editorEventProcessor; + bool hideText = false; private: @@ -32,4 +34,6 @@ class GenericDelegate : public QStyledItemDelegate }; + + #endif // GENERICDELEGATE_H diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 37b3295d1..ea082b6f0 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -12,6 +12,7 @@ #include "browser/BrowserNodeDummy.h" #include "browser/BrowserAttribute.h" #include "browser/BrowserRelation.h" +#include "browser/BrowserExtraMember.h" #include "AttributeData.h" #include "BrowserView.h" #include "AType.h" @@ -39,46 +40,46 @@ static const int directionIndex = 8; 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()); + 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(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(event)->key() != Qt::Key_Space && - static_cast(event)->key() != Qt::Key_Select) { - return false; + QAbstractItemModel *model, + const QStyleOptionViewItem &option, + const QModelIndex &index) { + if ((event->type() == QEvent::MouseButtonRelease) || + (event->type() == QEvent::MouseButtonDblClick)) { + QMouseEvent *mouse_event = static_cast(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(event)->key() != Qt::Key_Space && + static_cast(event)->key() != Qt::Key_Select) { + return false; + } + } else { + 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); + 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) : @@ -106,7 +107,7 @@ void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, Tre TreeFunctions::FilterTreeAndRestoreNodes (dataAccessFunc, checksFunc, - expandedNodes, view, model, interface); + expandedNodes, view, model, interface); } void QuickEdit::OnContextMenu(QPoint point) @@ -133,12 +134,14 @@ void QuickEdit::CreateMenu() } } + + void QuickEdit::SetupItemCreationFuncs() { -// itemCreators.insert(UmlAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); -// itemCreators.insert(UmlAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2));/*composition?*/ -// itemCreators.insert(UmlDirectionalAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); -// itemCreators.insert(UmlDirectionalAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); + // itemCreators.insert(UmlAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); + // itemCreators.insert(UmlAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2));/*composition?*/ + // itemCreators.insert(UmlDirectionalAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); + // itemCreators.insert(UmlDirectionalAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); //void QuickEdit::AssignItemsForClass(QSharedPointer root, BrowserNode * classNode) //std::function<> @@ -149,24 +152,24 @@ void QuickEdit::SetupItemCreationFuncs() 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(CreateItemsForExternal, this, std::placeholders::_1, std::placeholders::_2)); + itemCreators.insert(UmlExtraMember, std::bind(&QuickEdit::AssignItemsForExtraNode, this, std::placeholders::_1, std::placeholders::_2)); } QList > QuickEdit::CreateCheckList() { -// QList > result; -// if(!ui->leVisitedSearch->text().trimmed().isEmpty()) -// { -// QString value = ui->leVisitedSearch->text(); -// std::function addressFilterFunc = [value](TreeItemInterface* iface) -// { -// BrowserNode* data = static_cast(iface->InternalPointer()); -// bool match = data->get_name().contains(value, Qt::CaseInsensitive); -// return match; -// }; -// result.append(addressFilterFunc); -// } -// return result; + // QList > result; + // if(!ui->leVisitedSearch->text().trimmed().isEmpty()) + // { + // QString value = ui->leVisitedSearch->text(); + // std::function addressFilterFunc = [value](TreeItemInterface* iface) + // { + // BrowserNode* data = static_cast(iface->InternalPointer()); + // bool match = data->get_name().contains(value, Qt::CaseInsensitive); + // return match; + // }; + // result.append(addressFilterFunc); + // } + // return result; } void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, @@ -193,394 +196,23 @@ void QuickEdit::SetupTreeModel(TreeModel*& model , QTreeView* view, view->setRootIsDecorated(true); } -#define ADD_GETSET(TYPE,HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ -HOLDER->AddGetter(ROW,ROLES, \ -[] (const BrowserNode* data) \ -{ \ - if(!data)\ - return QVariant(); \ - const TYPE* pointer = static_cast(data);\ - if(pointer) \ - return QVariant(pointer->ACCESSOR()); \ - else \ - return QVariant(); \ -} \ -); \ -HOLDER->AddSetter(ROW,ROLES, \ -[] (BrowserNode* data, QVariant value) \ -{ \ - if(!data)\ - return false; \ - TYPE* pointer = static_cast(data);\ - if(pointer) \ - pointer->SETTER(value.CONVERTER()); \ - pointer->modified();\ - return true;\ -} \ -); - -#define ADD_GETSET_DIRECT(TYPE,HOLDER,ROW,ROLES,CONVERTER,PARAM) \ -HOLDER->AddGetter(ROW,ROLES, \ -[] (const BrowserNode* data) \ -{ \ - if(!data)\ - return QVariant(); \ - const TYPE* pointer = static_cast(data);\ - if(pointer) \ - return QVariant(pointer->PARAM); \ - else \ - return QVariant(); \ -} \ -); \ -HOLDER->AddSetter(ROW,ROLES, \ -[] (BrowserNode* data, QVariant value) \ -{ \ - if(!data)\ - return false; \ - TYPE* pointer = static_cast(data);\ - if(pointer) \ - pointer->PARAM = value.CONVERTER(); \ - pointer->modified();\ - return true;\ -} \ -); - -#define ADD_GETSET_DIRECT_ASSIGNMENT(TYPE,HOLDER,ROW,ROLES,PARAM, ASSIGNSTRING) \ -HOLDER->AddGetter(ROW,ROLES, \ -[] (const BrowserNode* data) \ -{ \ - if(!data)\ - return QVariant(); \ - const TYPE* pointer = static_cast(data);\ - if(pointer) \ - return QVariant(pointer->PARAM); \ - else \ - return QVariant(); \ -} \ -); \ -HOLDER->AddSetter(ROW,ROLES, \ -[] (BrowserNode* data, QVariant value) \ -{ \ - if(!data)\ - return false; \ - TYPE* pointer = static_cast(data);\ - if(pointer) \ - pointer->PARAM = ASSIGNSTRING;\ - pointer->modified();\ - return true;\ -} \ -); - - - -// some really insane code from stackoverflow that allows to shorten lengthy ifs -template -bool operator *(const T0& lhs, const std::array& rhs) { - return std::find(begin(rhs), end(rhs), lhs) != end(rhs); -} - -template std::array in(T0 arg0, T...args) { - return {{arg0, args...}}; -} - - -#define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ -HOLDER->AddGetter(ROW,ROLES, \ -[] (const BrowserNode* data) \ -{ \ - if(!data)\ - return QVariant(); \ - const TYPE* pointer = static_cast(data);\ - if(pointer) \ - return QVariant(((DATA_TYPE*)pointer->get_data())->ACCESSOR()); \ - else \ - return QVariant(); \ -} \ -); \ -HOLDER->AddSetter(ROW,ROLES, \ -[] (BrowserNode* data, QVariant value) \ -{ \ - if(!data)\ - return false; \ - TYPE* pointer = static_cast(data);\ - if(pointer) \ - ((DATA_TYPE*)pointer->get_data())->SETTER(value.CONVERTER()); \ - pointer->modified();\ - return true;\ -} \ -); - -void QuickEdit::SetupClassController(QSharedPointer > &) -{ - classController = QSharedPointer >( new ItemController()); - classController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); - ADD_GETSET(BrowserClass, classController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_name, set_name); - ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toInt, def->get_uml_visibility, def->set_uml_visibility); - ADD_GETSET(BrowserClass, classController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toBool, def->get_is_abstract, def->set_is_abstract); - - - classController->AddFlagsFunctor - ( - [](const QModelIndex& index) - { - Qt::ItemFlags result; - result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,stereotypeIndex,visibilityIndex,abstractIndex))) - return result; - - TreeItemInterface* iface = static_cast(index.internalPointer()); - if(!iface) - return result; - BrowserNode* pointer = static_cast(iface->InternalPointer()); - if(!pointer) - return result; - if(pointer->is_writable()) - result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled; - return result; - } - ); - -} - -void QuickEdit::SetupOperationController(QSharedPointer > &) -{ - operationController = QSharedPointer >( new ItemController()); - operationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); - ADD_GETSET(BrowserOperation, operationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_name, set_name); - ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_param_type().get_type, set_param_type); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toInt, get_cpp_visibility, set_cpp_visibility); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toBool,get_isa_class_operation, set_isa_class_operation); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toBool,get_is_abstract, set_is_abstract); - - - operationController->AddFlagsFunctor - ( - [](const QModelIndex& index) - { - Qt::ItemFlags result; - result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,staticIndex,visibilityIndex,abstractIndex))) - return result; - - TreeItemInterface* iface = static_cast(index.internalPointer()); - if(!iface) - return result; - BrowserNode* pointer = static_cast(iface->InternalPointer()); - if(!pointer) - return result; - if(pointer->is_writable()) - result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled; - return result; - } - ); -} - -void QuickEdit::SetupAttributeController(QSharedPointer > &) -{ - attributeController = QSharedPointer >( new ItemController()); - attributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); - ADD_GETSET(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_name, set_name); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_type().get_type, set_type); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_init_value, set_init_value); - ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toInt, def->get_uml_visibility, def->set_visibility); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toBool,get_isa_class_attribute, set_isa_class_attribute); - - - - attributeController->AddFlagsFunctor - ( - [](const QModelIndex& index) - { - Qt::ItemFlags result; - result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,stereotypeIndex, visibilityIndex, staticIndex))) - return result; - - TreeItemInterface* iface = static_cast(index.internalPointer()); - if(!iface) - return result; - BrowserNode* pointer = static_cast(iface->InternalPointer()); - if(!pointer) - return result; - if(pointer->is_writable()) - result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled ; - return result; - } - ); -} - -void QuickEdit::SetupOperationAttributeController(QSharedPointer > &) -{ - operationAttributeController = QSharedPointer >( new ItemController()); - operationAttributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_name, set_name); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_direction, set_direction); - - - - operationAttributeController->AddFlagsFunctor - ( - [](const QModelIndex& index) - { - Qt::ItemFlags result; - result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,visibilityIndex))) - return result; - - TreeItemInterface* iface = static_cast(index.internalPointer()); - if(!iface) - return result; - BrowserNode* pointer = static_cast(iface->InternalPointer()); - if(!pointer) - return result; - if(pointer->is_writable()) - result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled ; - return result; - } - ); -} - - -void QuickEdit::SetupRelationController(QSharedPointer > &) -{ - relationController = QSharedPointer >( new ItemController()); - relationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); - - ADD_GETSET(BrowserRelation, relationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_name, set_name); - ADD_GETSET_DIRECT(BrowserRelation, relationController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, def->a.init_value.operator QString()); - ADD_GETSET_DIRECT_ASSIGNMENT(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - def->a.uml_visibility, static_cast(value.toInt())); - ADD_GETSET_DIRECT(BrowserRelation, relationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toBool, def->a.isa_class_relation); - ADD_GETSET_DIRECT(BrowserRelation, relationController, multiplicityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, def->a.multiplicity.operator QString()); - - relationController->AddGetter(typeIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - [] (const BrowserNode* data) - { - if(!data) - return QVariant(); - const BrowserRelation* pointer = static_cast(data); - if(pointer) - return QVariant(pointer->def->get_end_class()->get_name()); - else - return QVariant(); - } - ); - relationController->AddSetter(1,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - [] (BrowserNode* data, QVariant value) - { - if(!data) - return false; - BrowserRelation* pointer = static_cast(data); - if(pointer) - pointer->def->get_end_class()->set_name(value.toString()); - pointer->modified(); - return true; - }); - - - relationController->AddFlagsFunctor - ( - [](const QModelIndex& index) - { - Qt::ItemFlags result; - result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,visibilityIndex))) - return result; - - TreeItemInterface* iface = static_cast(index.internalPointer()); - if(!iface) - return result; - BrowserNode* pointer = static_cast(iface->InternalPointer()); - if(!pointer) - return result; - if(pointer->is_writable()) - result |= Qt::ItemIsEditable; - result |= Qt::ItemIsEnabled ; - return result; - } - ); -} - void QuickEdit::Init(UmlWindow* window, BrowserView* view) { originalView = view; mainWindow = window; nullController = QSharedPointer > (new ItemController()); //validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, -// UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; + // UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, - UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation}; + UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; //validTypes = {UmlClass, UmlOperation, UmlAttribute}; SetupItemCreationFuncs(); qRegisterMetaType>("QList"); - SetupClassController(classController); - SetupOperationController(operationController); - SetupAttributeController(attributeController); - SetupOperationAttributeController(operationAttributeController); - SetupRelationController(relationController); + SetupControllers(); SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); - - GenericDelegate* checkboxDelegate = new GenericDelegate(ui->tvEditor); - checkboxDelegate->widgetCreator = [](QWidget * parent) {return new QCheckBox(parent);}; - checkboxDelegate->dataAccessor = [](QWidget * editor, const QModelIndex & index) - { - bool value = index.model()->data(index, Qt::EditRole).toBool(); - QCheckBox *checkboxEdit = static_cast(editor); - checkboxEdit->setChecked(value); - }; - checkboxDelegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) - { - QCheckBox * checkboxEdit = static_cast(editor); - bool value = checkboxEdit->isChecked(); - model->setData(index, value, Qt::EditRole); - }; - checkboxDelegate->editorEventProcessor = editorEvent; - - ui->tvEditor->setItemDelegateForColumn(6, checkboxDelegate); - ui->tvEditor->setItemDelegateForColumn(5, checkboxDelegate); + CheckBoxDelegateSetup(); //ui->tvEditor->setStyleSheet("QTreeView::item { border-right: 1px solid black }"); ui->tvEditor->setAlternatingRowColors(true); //connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint))); @@ -613,7 +245,7 @@ void QuickEdit::Show(BrowserNode * node) } QSharedPointer QuickEdit::CreateInterfaceNode(QSharedPointer root, - QSharedPointer > controller, BrowserNode * node ) + QSharedPointer > controller, BrowserNode * node ) { TreeItem* pointer = new TreeItem(0); QSharedPointer interfaceItem(pointer); @@ -630,6 +262,7 @@ void QuickEdit::AssignItemsForClass(QSharedPointer root, Bro QSharedPointer interfaceItem = CreateInterfaceNode(root, classController, classNode); QList children = classNode->children(validTypes); + std::reverse(children.begin(), children.end()); QList items; for(BrowserNode* child : children) { @@ -653,6 +286,12 @@ void QuickEdit::AssignItemsForRelation(QSharedPointer root, root->AddChildren(QList >() << interfaceItem); } +void QuickEdit::AssignItemsForExtraNode(QSharedPointer root, BrowserNode * extraNode) +{ + QSharedPointer interfaceItem = CreateInterfaceNode(root, extraNodeController, extraNode); + root->AddChildren(QList >() << interfaceItem); +} + void QuickEdit::AssignItemsForOperation(QSharedPointer root, BrowserNode * node) { QList> items; @@ -678,3 +317,54 @@ void QuickEdit::AssignItemsForOperation(QSharedPointer root, root->AddChildren(QList >() << 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 * parent) {return static_cast(0);}; + checkboxDelegate->paintProcessor = paintCheckbox; +// checkboxDelegate->dataAccessor = [](QWidget * editor, const QModelIndex & index) +// { +// bool value = index.model()->data(index, Qt::EditRole).toBool(); +// QCheckBox *checkboxEdit = static_cast(editor); +// checkboxEdit->setChecked(value); +// }; +// checkboxDelegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) +// { +// QCheckBox * checkboxEdit = static_cast(editor); +// bool value = checkboxEdit->isChecked(); +// model->setData(index, value, Qt::EditRole); +// }; + checkboxDelegate->editorEventProcessor = editorEvent; + + ui->tvEditor->setItemDelegateForColumn(staticIndex, checkboxDelegate); + ui->tvEditor->setItemDelegateForColumn(abstractIndex, checkboxDelegate); +} + +void QuickEdit::ComboBoxDelegateSetup() +{ + +} diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 319138f83..fc7bc1de6 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -56,6 +56,7 @@ class QuickEdit : public QWidget QSharedPointer > operationReturnTypeController; QSharedPointer > operationAttributeController; QSharedPointer > relationController; + QSharedPointer > extraNodeController; QSharedPointer classInterface; QSharedPointer operationInterface; @@ -63,12 +64,14 @@ class QuickEdit : public QWidget QSharedPointer operationReturnTypeInterface; QSharedPointer operationAttributeInterface; QSharedPointer relationInterface; + QSharedPointer extraNodeInterface; std::function classFlagFunctor; std::function operationFlagFunctor; std::function attributeFlagFunctor; std::function operationReturnTypeFlagFunctor; std::function operationAttributeFlagFunctor; + std::function extraNodeFlagFunctor; void SetupTreeModel(TreeModel*& , QTreeView*, @@ -77,15 +80,19 @@ class QuickEdit : public QWidget QSharedPointer&); - void SetupClassController(QSharedPointer >&); - void SetupOperationController(QSharedPointer >&); - void SetupAttributeController(QSharedPointer >&); - void SetupOperationAttributeController(QSharedPointer >&); - void SetupRelationController(QSharedPointer > &); + + void SetupClassController(); + void SetupOperationController(); + void SetupAttributeController(); + void SetupOperationAttributeController(); + void SetupRelationController(); + void SetupExtraNodeController(); + void SetupControllers(); void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); QList > CreateCheckList(); void CreateMenu(); - + void ComboBoxDelegateSetup(); + void CheckBoxDelegateSetup(); void SetupItemCreationFuncs(); QSharedPointer CreateInterfaceNode(QSharedPointer root, QSharedPointer > controller, BrowserNode *node); @@ -93,7 +100,7 @@ class QuickEdit : public QWidget void AssignItemsForClass(QSharedPointer root,BrowserNode*); void AssignItemsForAttribute(QSharedPointer root,BrowserNode*); void AssignItemsForRelation(QSharedPointer root, BrowserNode * classNode); -// void AssignItemsForExternal(QSharedPointer root,BrowserNode*); + void AssignItemsForExtraNode(QSharedPointer root,BrowserNode*); // void AssignItemsForAggregation(QSharedPointer root,BrowserNode*); public slots: diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp new file mode 100644 index 000000000..17acd78d5 --- /dev/null +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -0,0 +1,432 @@ +#include "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 "browser/BrowserClass.h" +#include "browser/BrowserOperationAttribute.h" +#include "browser/BrowserNodeDummy.h" +#include "browser/BrowserAttribute.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 +#include +#include +#include + +static const int nameIndex = 0; +static const int typeIndex = 1; +static const int defaultIndex = 2; +static const int stereotypeIndex = 3; +static const int visibilityIndex = 4; +static const int staticIndex = 5; +static const int abstractIndex = 6; +static const int multiplicityIndex = 7; +static const int directionIndex = 8; + +#define ADD_GETSET(TYPE,HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ + HOLDER->AddGetter(ROW,ROLES, \ + [] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(pointer->ACCESSOR()); \ + else \ + return QVariant(); \ + } \ + ); \ + HOLDER->AddSetter(ROW,ROLES, \ + [] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + pointer->SETTER(value.CONVERTER()); \ + pointer->modified();\ + return true;\ + } \ + ); + +#define ADD_GETSET_DIRECT(TYPE,HOLDER,ROW,ROLES,CONVERTER,PARAM) \ + HOLDER->AddGetter(ROW,ROLES, \ + [] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(pointer->PARAM); \ + else \ + return QVariant(); \ + } \ + ); \ + HOLDER->AddSetter(ROW,ROLES, \ + [] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + pointer->PARAM = value.CONVERTER(); \ + pointer->modified();\ + return true;\ + } \ + ); + +#define ADD_GETSET_DIRECT_ASSIGNMENT(TYPE,HOLDER,ROW,ROLES,PARAM, ASSIGNSTRING) \ + HOLDER->AddGetter(ROW,ROLES, \ + [] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(pointer->PARAM); \ + else \ + return QVariant(); \ + } \ + ); \ + HOLDER->AddSetter(ROW,ROLES, \ + [] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + pointer->PARAM = ASSIGNSTRING;\ + pointer->modified();\ + return true;\ + } \ + ); + +void QuickEdit::SetupControllers() +{ + SetupClassController(); + SetupOperationController(); + SetupAttributeController(); + SetupOperationAttributeController(); + SetupRelationController(); + SetupExtraNodeController(); +} + +// some really insane code from stackoverflow that allows to shorten lengthy ifs +template +bool operator *(const T0& lhs, const std::array& rhs) { + return std::find(begin(rhs), end(rhs), lhs) != end(rhs); +} + +template std::array in(T0 arg0, T...args) { + return {{arg0, args...}}; +} + + +#define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ + HOLDER->AddGetter(ROW,ROLES, \ + [] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(((DATA_TYPE*)pointer->get_data())->ACCESSOR()); \ + else \ + return QVariant(); \ + } \ + ); \ + HOLDER->AddSetter(ROW,ROLES, \ + [] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + ((DATA_TYPE*)pointer->get_data())->SETTER(value.CONVERTER()); \ + pointer->modified();\ + return true;\ + } \ + ); + +void QuickEdit::SetupClassController() +{ + classController = QSharedPointer >( new ItemController()); + classController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + ADD_GETSET(BrowserClass, classController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, def->get_is_abstract, def->set_is_abstract); + + + classController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex,stereotypeIndex,visibilityIndex,abstractIndex))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled; + return result; + } + ); +} + +void QuickEdit::SetupOperationController() +{ + operationController = QSharedPointer >( new ItemController()); + operationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + ADD_GETSET(BrowserOperation, operationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_param_type().get_type, set_param_type); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toInt, get_cpp_visibility, set_cpp_visibility); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_isa_class_operation, set_isa_class_operation); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_is_abstract, set_is_abstract); + + + operationController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex,typeIndex,staticIndex,visibilityIndex,abstractIndex))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserOperation* pointer = static_cast(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; + } + ); +} + +void QuickEdit::SetupAttributeController() +{ + attributeController = QSharedPointer >( new ItemController()); + attributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + ADD_GETSET(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_type().get_type, set_type); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_init_value, set_init_value); + ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_stereotype, def->set_stereotype); + ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toInt, def->get_uml_visibility, def->set_visibility); + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_isa_class_attribute, set_isa_class_attribute); + + + + attributeController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,stereotypeIndex, visibilityIndex, staticIndex))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled ; + return result; + } + ); +} + +void QuickEdit::SetupOperationAttributeController() +{ + operationAttributeController = QSharedPointer >( new ItemController()); + operationAttributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_param_type().get_type, set_param_type); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_default_value, set_default_value); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_direction, set_direction); + + + + operationAttributeController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,directionIndex))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserOperationAttribute* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + + if(pointer->is_writable() && !pointer->is_get_set()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled ; + return result; + } + ); +} + + +void QuickEdit::SetupRelationController() +{ + relationController = QSharedPointer >( new ItemController()); + relationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + + ADD_GETSET(BrowserRelation, relationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + ADD_GETSET_DIRECT(BrowserRelation, relationController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, def->a.init_value.operator QString()); + ADD_GETSET_DIRECT_ASSIGNMENT(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + def->a.uml_visibility, static_cast(value.toInt())); + ADD_GETSET_DIRECT(BrowserRelation, relationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, def->a.isa_class_relation); + ADD_GETSET_DIRECT(BrowserRelation, relationController, multiplicityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, def->a.multiplicity.operator QString()); + + relationController->AddGetter(typeIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data) + { + if(!data) + return QVariant(); + const BrowserRelation* pointer = static_cast(data); + if(pointer) + return QVariant(pointer->def->get_end_class()->get_name()); + else + return QVariant(); + } + ); + relationController->AddSetter(1,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (BrowserNode* data, QVariant value) + { + if(!data) + return false; + BrowserRelation* pointer = static_cast(data); + if(pointer) + pointer->def->get_end_class()->set_name(value.toString()); + pointer->modified(); + return true; + }); + + + relationController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,visibilityIndex))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable() && (index.column() *in(nameIndex,defaultIndex,visibilityIndex))) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled ; + return result; + } + ); +} + +void QuickEdit::SetupExtraNodeController() +{ + + extraNodeController = QSharedPointer >( new ItemController()); + extraNodeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + ); + ADD_GETSET(BrowserExtraMember, extraNodeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_name, set_name); + + extraNodeController->AddFlagsFunctor + ( + [](const QModelIndex& index) + { + Qt::ItemFlags result; + result |= Qt::ItemIsSelectable; + if(!(index.column() *in(nameIndex))) + return result; + + TreeItemInterface* iface = static_cast(index.internalPointer()); + if(!iface) + return result; + BrowserNode* pointer = static_cast(iface->InternalPointer()); + if(!pointer) + return result; + if(pointer->is_writable()) + result |= Qt::ItemIsEditable; + result |= Qt::ItemIsEnabled; + return result; + } + ); +} + + + diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index 31d016c05..f82170bf8 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -2,6 +2,7 @@ #define BROWSEROPERATIONATTRIBUTE_H #include "BrowserNode.h" #include "BrowserOperation.h" +#include "OperationData.h" #include "ParamData.h" #include "Labeled.h" @@ -47,6 +48,10 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove return operation->is_writable(); return false; } + bool is_get_set() + { + return ((OperationData*)operation->get_data())->get_or_set(); + } void modified(){operation->package_modified();} }; diff --git a/src/douml.pro b/src/douml.pro index 4f282a255..9c0fa7f28 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -523,7 +523,8 @@ SOURCES = \ dialog/GenerationSettingsBuiltinTable.cpp \ CustomWidgets/quickedit.cpp \ browser/BrowserOperationAttribute.cpp \ - CustomWidgets/GenericDelegate.cpp + CustomWidgets/GenericDelegate.cpp \ + CustomWidgets/quickeditcontrollersetup.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM From 4314bfc54a96f588efc8d6c5d4a66865010f0c5b Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 10 Mar 2013 01:57:48 +0400 Subject: [PATCH 048/297] core of quick edit is created --- src/CustomWidgets/quickedit.cpp | 130 +++++++++++++--- src/CustomWidgets/quickedit.h | 5 +- .../quickeditcontrollersetup.cpp | 145 ++++++++++++++++-- .../include/treeviewtemplatefunctions.h | 23 +++ src/Libs/L_UniversalModels/src/TreeModel.cpp | 2 +- src/browser/BrowserClass.cpp | 5 + src/browser/BrowserClass.h | 4 +- src/browser/BrowserNode.cpp | 10 ++ src/browser/BrowserNode.h | 6 + src/browser/BrowserOperation.cpp | 5 + src/browser/BrowserOperation.h | 2 + src/browser/BrowserOperationAttribute.cpp | 6 + src/browser/BrowserOperationAttribute.h | 1 + src/browser/BrowserRelation.cpp | 5 + src/browser/BrowserRelation.h | 2 + src/data/OperationData.cpp | 5 + src/diagram/UmlWindow.cpp | 2 +- 17 files changed, 326 insertions(+), 32 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index ea082b6f0..16017810d 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -13,6 +13,7 @@ #include "browser/BrowserAttribute.h" #include "browser/BrowserRelation.h" #include "browser/BrowserExtraMember.h" +#include "GenerationSettings.h" #include "AttributeData.h" #include "BrowserView.h" #include "AType.h" @@ -22,7 +23,8 @@ #include "data/RelationData.h" #include "GenericDelegate.h" - +#include +#include #include #include #include @@ -136,6 +138,8 @@ void QuickEdit::CreateMenu() + + void QuickEdit::SetupItemCreationFuncs() { // itemCreators.insert(UmlAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); @@ -210,9 +214,10 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) SetupItemCreationFuncs(); qRegisterMetaType>("QList"); SetupControllers(); + SetupDelegates(); SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); - CheckBoxDelegateSetup(); + //ui->tvEditor->setStyleSheet("QTreeView::item { border-right: 1px solid black }"); ui->tvEditor->setAlternatingRowColors(true); //connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint))); @@ -235,12 +240,19 @@ void QuickEdit::Show(BrowserNode * node) return; itemCreators[nodeType](rootInterface, node); // we then assign items and all is ok - //rootInterface->AddChildren(items); treeModel->InsertRootItem(rootInterface); ui->tvEditor->resizeColumnToContents(0); ui->tvEditor->resizeColumnToContents(1); ui->tvEditor->resizeColumnToContents(2); - this->show(); + + std::function check = [&](TreeItemInterface* interface) + { + return true; + }; + + TreeFunctions::ExpandAllSatisfying(check, ui->tvEditor, treeModel, QModelIndex()); + + this->showMaximized(); } @@ -344,27 +356,107 @@ static void paintCheckbox(const QStyledItemDelegate* delegate, QPainter *painter void QuickEdit::CheckBoxDelegateSetup() { GenericDelegate* checkboxDelegate = new GenericDelegate(ui->tvEditor, true); - checkboxDelegate->widgetCreator = [](QWidget * parent) {return static_cast(0);}; + checkboxDelegate->widgetCreator = [](QWidget * ) {return static_cast(0);}; checkboxDelegate->paintProcessor = paintCheckbox; -// checkboxDelegate->dataAccessor = [](QWidget * editor, const QModelIndex & index) -// { -// bool value = index.model()->data(index, Qt::EditRole).toBool(); -// QCheckBox *checkboxEdit = static_cast(editor); -// checkboxEdit->setChecked(value); -// }; -// checkboxDelegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) -// { -// QCheckBox * checkboxEdit = static_cast(editor); -// bool value = checkboxEdit->isChecked(); -// model->setData(index, value, Qt::EditRole); -// }; checkboxDelegate->editorEventProcessor = editorEvent; - ui->tvEditor->setItemDelegateForColumn(staticIndex, checkboxDelegate); ui->tvEditor->setItemDelegateForColumn(abstractIndex, checkboxDelegate); } -void QuickEdit::ComboBoxDelegateSetup() + +void QuickEdit::VisibilityDelegateSetup() +{ + GenericDelegate* visibilityDelegate = new GenericDelegate(ui->tvEditor, false); + visibilityDelegate->widgetCreator = [&](QWidget * parent) + { + QStringList 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(editor); + box->setCurrentText(value); + }; + visibilityDelegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) + { + QComboBox * box = static_cast(editor); + QString value = box->currentText(); + model->setData(index, value, Qt::EditRole); + }; + ui->tvEditor->setItemDelegateForColumn(visibilityIndex, 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(editor); + box->setCurrentText(value); + }; + delegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) + { + QComboBox * box = static_cast(editor); + QString value = box->currentText(); + model->setData(index, value, Qt::EditRole); + }; + ui->tvEditor->setItemDelegateForColumn(typeIndex, delegate); +} + +void QuickEdit::DirectionDelegateSetup() +{ + GenericDelegate* delegate = new GenericDelegate(ui->tvEditor, false); + delegate->widgetCreator = [&](QWidget * parent) + { + QStringList 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(editor); + box->setCurrentText(value); + }; + delegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) + { + QComboBox * box = static_cast(editor); + QString value = box->currentText(); + model->setData(index, value, Qt::EditRole); + }; + ui->tvEditor->setItemDelegateForColumn(directionIndex, delegate); } diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index fc7bc1de6..573a7102b 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -88,10 +88,13 @@ class QuickEdit : public QWidget void SetupRelationController(); void SetupExtraNodeController(); void SetupControllers(); + void SetupDelegates(); void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); QList > CreateCheckList(); void CreateMenu(); - void ComboBoxDelegateSetup(); + void VisibilityDelegateSetup(); + void TypeDelegateSetup(); + void DirectionDelegateSetup(); void CheckBoxDelegateSetup(); void SetupItemCreationFuncs(); diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 17acd78d5..b50bbf38d 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -64,6 +64,46 @@ static const int directionIndex = 8; } \ ); +#define ADD_PIXMAP_GETTER(TYPE,HOLDER,ROW,ROLES,ACCESSOR) \ + HOLDER->AddGetter(ROW,ROLES, \ + [] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(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(ROW,ROLES, \ + [] (const BrowserNode* data) \ +{ \ + if(!data)\ + return QVariant(); \ + const TYPE* pointer = static_cast(data);\ + if(pointer) \ + return QVariant(pointer->ACCESSOR()); \ + else \ + return QVariant(); \ + } \ + ); \ + HOLDER->AddSetter(ROW,ROLES, \ + [] (BrowserNode* data, QVariant value) \ +{ \ + if(!data)\ + return false; \ + TYPE* pointer = static_cast(data);\ + if(pointer) \ + SETTER(VALUECONVERTER(value.VARIANTCONVERTER())); \ + pointer->modified();\ + return true;\ + } \ + ); + #define ADD_GETSET_DIRECT(TYPE,HOLDER,ROW,ROLES,CONVERTER,PARAM) \ HOLDER->AddGetter(ROW,ROLES, \ [] (const BrowserNode* data) \ @@ -126,6 +166,14 @@ void QuickEdit::SetupControllers() SetupExtraNodeController(); } +void QuickEdit::SetupDelegates() +{ + CheckBoxDelegateSetup(); + VisibilityDelegateSetup(); + TypeDelegateSetup(); + DirectionDelegateSetup(); +} + // some really insane code from stackoverflow that allows to shorten lengthy ifs template bool operator *(const T0& lhs, const std::array& rhs) { @@ -173,11 +221,38 @@ void QuickEdit::SetupClassController() toString, get_name, set_name); ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toInt, def->get_uml_visibility, def->set_uml_visibility); +// ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// toString, get_stereotype, def->set_stereotype); +// ADD_GETSET(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// toInt, def->get_uml_visibility, def->set_uml_visibility); + + + ADD_GETSET_CONVERTED(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool, def->get_is_abstract, def->set_is_abstract); + ADD_PIXMAP_GETTER(BrowserClass, classController, nameIndex,std::initializer_list({Qt::DecorationRole}), pixmap); +// classController->AddGetter(nameIndex,std::initializer_list({Qt::DecorationRole}), +// [] (const BrowserNode* data) +//{ +// if(!data) +// return QVariant(); +// const BrowserClass* pointer = static_cast(data); +// if(pointer) +// { +// const QPixmap* px = pointer->pixmap(0); +//// QPixmap pxConst = QIcon(":/root/icons/mouse_control.png").pixmap(); +//// const QPixmap* px = &pxConst; +// return QVariant(QIcon(*px)); +// } +// else +// return QVariant(); +// } +// ); + + classController->AddFlagsFunctor ( @@ -212,13 +287,21 @@ void QuickEdit::SetupOperationController() toString, get_name, set_name); ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_param_type().get_type, set_param_type); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toInt, get_cpp_visibility, set_cpp_visibility); +// ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// toInt, get_cpp_visibility, set_cpp_visibility); +// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserOperation, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// visibility_as_string(), BrowserNode::encode_visibility(value.toString())); + + ADD_GETSET_CONVERTED(BrowserOperation, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_uml_visibility); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_isa_class_operation, set_isa_class_operation); ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_is_abstract, set_is_abstract); + ADD_PIXMAP_GETTER(BrowserOperation, operationController, nameIndex,std::initializer_list({Qt::DecorationRole}), pixmap); + operationController->AddFlagsFunctor ( @@ -257,12 +340,18 @@ void QuickEdit::SetupAttributeController() toString, get_init_value, set_init_value); ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toInt, def->get_uml_visibility, def->set_visibility); + +// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// visibility_as_string(), BrowserNode::encode_visibility(value.toString())); + ADD_GETSET_CONVERTED(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_visibility); + + + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_isa_class_attribute, set_isa_class_attribute); - + ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); attributeController->AddFlagsFunctor ( @@ -302,6 +391,10 @@ void QuickEdit::SetupOperationAttributeController() ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_direction, set_direction); + //ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + + ADD_PIXMAP_GETTER(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + operationAttributeController->AddFlagsFunctor @@ -340,8 +433,40 @@ void QuickEdit::SetupRelationController() toString, get_name, set_name); ADD_GETSET_DIRECT(BrowserRelation, relationController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, def->a.init_value.operator QString()); - ADD_GETSET_DIRECT_ASSIGNMENT(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - def->a.uml_visibility, static_cast(value.toInt())); +// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// visibility_as_string(), BrowserNode::encode_visibility(value.toString())); + std::function f = [](RoleData& data, UmlVisibility vis){data.uml_visibility = vis;}; +// ADD_GETSET_CONVERTED(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// toString,BrowserNode::encode_visibility,visibility_as_string, [](RoleData& data, UmlVisibility vis){data.uml_visibility = vis;}(pointer->def->a)); + ADD_PIXMAP_GETTER(BrowserRelation, relationController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + + + relationController->AddGetter(visibilityIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data) +{ + if(!data) + return QVariant(); + const BrowserRelation* pointer = static_cast(data); + if(pointer) + return QVariant(pointer->visibility_as_string()); + else + return QVariant(); + } + ); + relationController->AddSetter(visibilityIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (BrowserNode* data, QVariant value) +{ + if(!data) + return false; + BrowserRelation* pointer = static_cast(data); + if(pointer) + pointer->def->a.uml_visibility = BrowserNode::encode_visibility(value.toString()); + pointer->modified(); + return true; + } + ); + + ADD_GETSET_DIRECT(BrowserRelation, relationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool, def->a.isa_class_relation); ADD_GETSET_DIRECT(BrowserRelation, relationController, multiplicityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), @@ -405,6 +530,8 @@ void QuickEdit::SetupExtraNodeController() ADD_GETSET(BrowserExtraMember, extraNodeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); + ADD_PIXMAP_GETTER(BrowserExtraMember, extraNodeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + extraNodeController->AddFlagsFunctor ( [](const QModelIndex& index) diff --git a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h index 6fa02ca4e..dc2150e0d 100644 --- a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h +++ b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h @@ -298,6 +298,29 @@ void StoreNodePathExpandState(std::function dataAccessor, // Bouml preserved body end 002020AA } + +template +bool ExpandAllSatisfying(std::function 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 + (check, view, model, child)) + { + view->setExpanded( startIndex.sibling(startIndex.row(), 0), true ); + returnResult = true; + } + } + if(returnResult || check(static_cast(startIndex.internalPointer()))) + returnResult = true; + return returnResult; +} + template class ItemType, typename DataType> void FilterTreeAndRestoreNodes(std::function dataAccessor, std::function > ()> createCheckListFunc, diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp index 69580e2cc..ba1f92bc0 100644 --- a/src/Libs/L_UniversalModels/src/TreeModel.cpp +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -55,7 +55,7 @@ QVariant TreeModel::data(const QModelIndex & index, int role) const 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) + if(role == Qt::DisplayRole || role == Qt::EditRole || role == Qt::DecorationRole) return item->data(index.column(),role); // if(role == Qt::DecorationRole ) diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 3ee6c5f1d..a55202edd 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1605,6 +1605,11 @@ 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 & l) const diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index 6bc014987..c3625a71e 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -49,6 +49,7 @@ class BrowserClassDiagram; #include "BrowserNode.h" #include "Labeled.h" +#include "UmlEnum.h" class BrowserClass : public BrowserNode, public Labeled { @@ -90,7 +91,8 @@ class BrowserClass : public BrowserNode, public Labeled // more modern interface to get all parents. Still a lot of qt3 compatibility inside QList 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; bool have_abstract_operation(); diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 1cc53d548..74646488c 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -698,6 +698,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(QString val) +{ + return visibility(val); +} + void BrowserNode::package_settings(BooL &, ShowContextMode &) const { // never called diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index 3e8b01341..b0cafc3f1 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -238,6 +238,12 @@ 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(QString) ; + 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; diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp index 33e7d462f..4072cd3c2 100644 --- a/src/browser/BrowserOperation.cpp +++ b/src/browser/BrowserOperation.cpp @@ -892,6 +892,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; diff --git a/src/browser/BrowserOperation.h b/src/browser/BrowserOperation.h index c5d3730fc..085f6e55a 100644 --- a/src/browser/BrowserOperation.h +++ b/src/browser/BrowserOperation.h @@ -44,6 +44,7 @@ class BrowserOperation : public BrowserNode, public Labeled { friend class StereotypesDialog; friend class BrowserOperationAttribute; + friend class QuickEdit; protected: static IdDict all; @@ -100,6 +101,7 @@ class BrowserOperation : public BrowserNode, public Labeled virtual UmlCode get_type() const; 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; diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp index e77cbb786..9d6652c6d 100644 --- a/src/browser/BrowserOperationAttribute.cpp +++ b/src/browser/BrowserOperationAttribute.cpp @@ -2,6 +2,7 @@ #include "BrowserView.h" #include "BrowserClass.h" #include "OperationData.h" +#include "UmlPixmap.h" static QStringList DirList; static void FIllDirList() @@ -94,6 +95,11 @@ QString BrowserOperationAttribute::get_passage_type() const return QString(); } +const QPixmap *BrowserOperationAttribute::pixmap(int) const +{ + return PublicAttributeIcon; +} + BrowserOperationReturnType::BrowserOperationReturnType(BrowserView* view, BrowserOperation* _operation): BrowserNodeAbstractRemove(view), operation(_operation) { diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index f82170bf8..764566688 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -53,6 +53,7 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove return ((OperationData*)operation->get_data())->get_or_set(); } void modified(){operation->package_modified();} + virtual const QPixmap * pixmap(int) const; }; diff --git a/src/browser/BrowserRelation.cpp b/src/browser/BrowserRelation.cpp index f44d4ad50..51c9768fc 100644 --- a/src/browser/BrowserRelation.cpp +++ b/src/browser/BrowserRelation.cpp @@ -208,6 +208,11 @@ void BrowserRelation::set_comment(const char * c) def->set_comment_b(c); } +UmlVisibility BrowserRelation::get_visibility() const +{ + return def->get_uml_visibility_a(); +} + void BrowserRelation::compute_referenced_by(Q3PtrList & l, BrowserClass * target) { diff --git a/src/browser/BrowserRelation.h b/src/browser/BrowserRelation.h index 9e43c6f11..72433537f 100644 --- a/src/browser/BrowserRelation.h +++ b/src/browser/BrowserRelation.h @@ -71,6 +71,8 @@ friend class QuickEdit; virtual const char * get_comment() const; virtual void set_comment(const char * c); + virtual UmlVisibility get_visibility() const override; + BrowserOperation * get_get_oper() { return get_oper; }; diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 4cf554b89..64ae48413 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -710,6 +710,11 @@ 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; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index acd5056d6..4f5602b1d 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -491,7 +491,7 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) quickEdit->Init(this, browser); - sh1 = new QShortcut(QKeySequence(tr("1")),this, SLOT(OnShowQuickEdit()),SLOT(OnShowQuickEdit()), Qt::ApplicationShortcut); + sh1 = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_E),this, SLOT(OnShowQuickEdit()),SLOT(OnShowQuickEdit()), Qt::ApplicationShortcut); splTreeTab = new QSplitter(Qt::Vertical, spl1); From b978b62e3156c28a76da04a86766d27592bebfb4 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 10 Mar 2013 02:37:41 +0400 Subject: [PATCH 049/297] filtering works for quick edit --- src/CustomWidgets/quickedit.cpp | 34 +++++++++++-------- src/CustomWidgets/quickedit.h | 1 + .../include/treeitemfunctions.h | 8 ++--- .../include/treeviewtemplatefunctions.h | 8 ++--- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 16017810d..7fb05fcb3 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -109,7 +109,7 @@ void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, Tre TreeFunctions::FilterTreeAndRestoreNodes (dataAccessFunc, checksFunc, - expandedNodes, view, model, interface); + expandedNodes, view, model, interface, false); } void QuickEdit::OnContextMenu(QPoint point) @@ -126,6 +126,11 @@ void QuickEdit::OnShow() Show(current); } +void QuickEdit::OnPerformFiltering(QString) +{ + PerformFiltering(expandedNodes, ui->tvEditor, treeModel, rootInterface); +} + void QuickEdit::CreateMenu() { @@ -161,19 +166,20 @@ void QuickEdit::SetupItemCreationFuncs() QList > QuickEdit::CreateCheckList() { - // QList > result; - // if(!ui->leVisitedSearch->text().trimmed().isEmpty()) - // { - // QString value = ui->leVisitedSearch->text(); - // std::function addressFilterFunc = [value](TreeItemInterface* iface) - // { - // BrowserNode* data = static_cast(iface->InternalPointer()); - // bool match = data->get_name().contains(value, Qt::CaseInsensitive); - // return match; - // }; - // result.append(addressFilterFunc); - // } - // return result; + QList > result; + if(!ui->leSearch->text().trimmed().isEmpty()) + { + QString value = ui->leSearch->text(); + std::function addressFilterFunc = [value](TreeItemInterface* iface) + { + BrowserNode* data = static_cast(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, diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 573a7102b..65de663a7 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -109,6 +109,7 @@ class QuickEdit : public QWidget public slots: void OnContextMenu(QPoint); void OnShow(); + void OnPerformFiltering(QString); //void OnPerformFiltering(QString); }; diff --git a/src/Libs/L_UniversalModels/include/treeitemfunctions.h b/src/Libs/L_UniversalModels/include/treeitemfunctions.h index 61043a358..2f1ed041f 100644 --- a/src/Libs/L_UniversalModels/include/treeitemfunctions.h +++ b/src/Libs/L_UniversalModels/include/treeitemfunctions.h @@ -40,7 +40,7 @@ using ModifierFunctions = QList >; * @forcePick говорит о том, что ноду нужно зацепить в любом случае(когда нода-папка удовлетворяет условию) **/ template -QSharedPointer RecursiveGetSubset(InterfaceType* rootItem, RootChecks filterFunctions, bool forcePick = false) +QSharedPointer RecursiveGetSubset(InterfaceType* rootItem, RootChecks filterFunctions, bool forcePick = false, bool forceChildren = true) { QList> newChildren; bool nodeValid = true; @@ -56,7 +56,7 @@ QSharedPointer RecursiveGetSubset(InterfaceType* rootItem, RootCh { for(QSharedPointer child: rootItem->GetChildren()) { - QSharedPointer newChild = RecursiveGetSubset(child.data(), filterFunctions, nodeValid); + QSharedPointer newChild = RecursiveGetSubset(child.data(), filterFunctions, nodeValid && forceChildren, forceChildren); if(!newChild.isNull()) newChildren += newChild; } @@ -185,13 +185,13 @@ QList RecursiveGet(T* rootItem, std::function accessor) * @filterFunctions список проверок которым должна удовлетворять нода **/ template class ItemType, typename DataType> -QSharedPointer FilterSubset(QSharedPointer rootItem, QList > filterFunctions) +QSharedPointer FilterSubset(QSharedPointer rootItem, QList > filterFunctions, bool forceChildren = true) { QSharedPointer item; ItemType* newRoot = new ItemType(0); item = QSharedPointer(newRoot); - item = TreeFunctions::RecursiveGetSubset>(rootItem.data(), filterFunctions); + item = TreeFunctions::RecursiveGetSubset>(rootItem.data(), filterFunctions, false, forceChildren); return item; } diff --git a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h index dc2150e0d..b2c63f316 100644 --- a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h +++ b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h @@ -181,14 +181,14 @@ TreeItemType* AddItem(std::function dataGenerator template class ItemType, typename DataType> bool PerformFiltering(TreeModel* treeModel, QSharedPointer rootItem, - std::function > ()> createCheckListFunc) + std::function > ()> createCheckListFunc, bool forceChildren = true) { QSharedPointer item; QList > checkList = createCheckListFunc(); if(checkList.isEmpty()) item = rootItem; else - item = TreeFunctions::FilterSubset(rootItem, checkList); + item = TreeFunctions::FilterSubset(rootItem, checkList, forceChildren); treeModel->InsertRootItem(item); if(item == rootItem) return false; @@ -327,10 +327,10 @@ void FilterTreeAndRestoreNodes(std::function dataAccessor, QStringList & nodes, QTreeView * view, TreeModel * model, - QSharedPointer startIndex) + QSharedPointer startIndex, bool forceChildren = true) { TreeFunctions::StoreNodePathExpandState(dataAccessor, nodes, view, model, QModelIndex()); - PerformFiltering(model,startIndex,createCheckListFunc); + PerformFiltering(model,startIndex,createCheckListFunc, forceChildren); TreeFunctions::ApplyNodePathExpandState(dataAccessor, nodes, view, model, QModelIndex()); } } From a4d829892c0655786499ed9d521049f05e0baa0a Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 10 Mar 2013 02:53:01 +0400 Subject: [PATCH 050/297] fixed searching to actually notice operation parameters --- src/CustomWidgets/quickedit.cpp | 5 +++++ src/browser/BrowserNode.h | 2 +- src/data/ParamData.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 7fb05fcb3..9803121c0 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -129,6 +129,11 @@ void QuickEdit::OnShow() void QuickEdit::OnPerformFiltering(QString) { PerformFiltering(expandedNodes, ui->tvEditor, treeModel, rootInterface); + std::function check = [&](TreeItemInterface* interface) + { + return true; + }; + TreeFunctions::ExpandAllSatisfying(check, ui->tvEditor, treeModel, QModelIndex()); } diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index b0cafc3f1..3a2210f9d 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -115,7 +115,7 @@ class BrowserNode : public Q3ListViewItem, virtual bool is_undefined() const; - QString get_name() const { + virtual QString get_name() const { return name; } virtual void set_name(QString s); diff --git a/src/data/ParamData.h b/src/data/ParamData.h index b1a177ba5..430a0dca5 100644 --- a/src/data/ParamData.h +++ b/src/data/ParamData.h @@ -45,7 +45,7 @@ class ParamData ParamData(); void set_name(const char *); - const char * get_name() const { + QString get_name() const { return name; }; UmlParamDirection get_dir() const { From f381f4a665d236c838355c432f81215d36c8dad1 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 10 Mar 2013 17:03:32 +0400 Subject: [PATCH 051/297] this seems to recompute parameter direction correctly --- .../quickeditcontrollersetup.cpp | 8 + src/Libs/L_UniversalModels/UML/models/201002 | 61 ++- .../L_UniversalModels/UML/models/42.session | 5 +- .../UML/models/generation_settings | 1 - .../L_UniversalModels/UML/models/models.prj | 2 +- .../include/ItemController.h | 45 ++- src/Libs/L_UniversalModels/include/TreeItem.h | 20 +- .../include/TreeItemInterface.h | 6 +- src/Libs/L_UniversalModels/src/TreeModel.cpp | 4 +- src/browser/BrowserOperationAttribute.h | 2 + src/browserfunctions/operationfuncs.cpp | 373 ++++++++++++++++++ src/browserfunctions/operationfuncs.h | 18 + src/data/OperationData.h | 5 + src/diagram/UmlWindow.h | 3 +- src/dialog/OperationDialog.cpp | 219 +--------- src/douml.pro | 6 +- 16 files changed, 525 insertions(+), 253 deletions(-) create mode 100644 src/browserfunctions/operationfuncs.cpp create mode 100644 src/browserfunctions/operationfuncs.h diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index b50bbf38d..ef5740554 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -21,6 +21,7 @@ #include "data/OperationData.h" #include "data/RelationData.h" #include "GenericDelegate.h" +#include "browserfunctions/operationfuncs.h" #include @@ -391,6 +392,13 @@ void QuickEdit::SetupOperationAttributeController() ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_direction, set_direction); + std::function f = [](BrowserNode* node, const QModelIndex& index) + { + BrowserOperationAttribute* oper = static_cast(node); + recompute_param(oper->get_operation(),index.row(),true); + }; + operationAttributeController->AddPostProcessors(directionIndex, QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); + //ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); ADD_PIXMAP_GETTER(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index 5f1caa944..6e423f339 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 33 + revision 34 modified_by 42 "zeks" // class settings //class diagram settings @@ -785,11 +785,11 @@ ${inlines} nparams 3 param in name "item" explicit_type "T" - param in name "index" explicit_type "int" + 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}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract}; + 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}, ${t1} ${p1}, ${t2} ${p2}${)}${const}${staticnl} + cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} * ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${staticnl} { ${body}} " @@ -804,12 +804,12 @@ ${inlines} nparams 4 param inout name "item" explicit_type "T" - param in name "column" explicit_type "int" + 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}, ${t1} ${p1}${v1}, const ${t2} & ${p2}${v2}, ${t3} ${p3}${v3}${)}${const}${volatile}${abstract}; + 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}, ${t1} ${p1}, const ${t2} & ${p2}, ${t3} ${p3}${)}${const}${staticnl} + cpp_def "${description}${inline}${type} ${class}::${name}${(}${t0} * ${p0}, const ${t1} & ${p1}, const ${t2} & ${p2}, ${t3} ${p3}${)}${const}${staticnl} { ${body}} " @@ -899,6 +899,44 @@ ${inlines} 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" + 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" + param inout name "_postProcessor" explicit_type "std::function" + 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" @@ -1050,6 +1088,15 @@ ${inlines} get_oper operation_ref 2207786 // get_flagsFunctors set_oper operation_ref 2207914 // set_flagsFunctors end + + attribute 1326890 "postProcessors" + private explicit_type "QHash , std::function >" + cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" + java_decl "" + php_decl "" + python_decl "" + idl_decl "" + end end class 714922 "TreeItemInterface" diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index b8c3b2a02..c96294d94 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,9 +4,10 @@ diagrams 1047 806 100 3 0 0 end show_stereotypes -selected artifact_ref 613034 // ItemController +selected operation_ref 2303914 // AddPostProcessor open - class_ref 714922 // TreeItemInterface + class_ref 714666 // ItemController + class_ref 741802 // TreeModel deploymentview_ref 227626 // classes end end diff --git a/src/Libs/L_UniversalModels/UML/models/generation_settings b/src/Libs/L_UniversalModels/UML/models/generation_settings index 2bb48272e..7c8b4673d 100644 --- a/src/Libs/L_UniversalModels/UML/models/generation_settings +++ b/src/Libs/L_UniversalModels/UML/models/generation_settings @@ -184,7 +184,6 @@ ${items} { ${body}} " - cpp_force_throw cpp_indent_visibility " "java_default_src_content "${comment} ${package} ${imports} diff --git a/src/Libs/L_UniversalModels/UML/models/models.prj b/src/Libs/L_UniversalModels/UML/models/models.prj index 7983eee94..6587ffec7 100644 --- a/src/Libs/L_UniversalModels/UML/models/models.prj +++ b/src/Libs/L_UniversalModels/UML/models/models.prj @@ -1,6 +1,6 @@ format 75 "models" - revision 128 + revision 129 modified_by 42 "zeks" cpp_root_dir "E:\\Programming\\Douml\\src\\Libs\\L_UniversalModels\\" diff --git a/src/Libs/L_UniversalModels/include/ItemController.h b/src/Libs/L_UniversalModels/include/ItemController.h index fd1859414..ef025227b 100644 --- a/src/Libs/L_UniversalModels/include/ItemController.h +++ b/src/Libs/L_UniversalModels/include/ItemController.h @@ -27,8 +27,8 @@ #include #include -#include #include +#include #include #include "l_tree_controller_global.h" @@ -43,9 +43,9 @@ class ItemController void SetColumns(QStringList value); - QVariant GetValue(const T * item, int index, int role); + QVariant GetValue(const T * item, const QModelIndex & index, int role); - bool SetValue(T * item, int column, const QVariant & value, int role); + bool SetValue(T * item, const QModelIndex & index, const QVariant & value, int role); void AddGetter(const QPair & index, std::function function); @@ -55,6 +55,10 @@ class ItemController void AddSetter(int row, const QVector & roles, std::function function); + void AddPostProcessor(int column, int role, std::function _postProcessor); + + void AddPostProcessors(int column, QVector roles, std::function _postProcessor); + Qt::ItemFlags flags(const QModelIndex & index) const; inline QVector > GetFlagsFunctors(); @@ -71,6 +75,7 @@ class ItemController QHash, std::function > getters; QHash, std::function > setters; QVector > flagsFunctors; + QHash , std::function > postProcessors; }; template inline QStringList ItemController::GetColumns() const @@ -85,24 +90,27 @@ void ItemController::SetColumns(QStringList value) } template -QVariant ItemController::GetValue(const T * item, int index, int role) +QVariant ItemController::GetValue(const T * item, const QModelIndex & index, int role) { // Bouml preserved body begin 00203B2A //return QVariant(); - if(!getters.contains(QPair(index, role))) + if(!getters.contains(QPair(index.column(), role))) return QVariant(); - QVariant ret = getters[QPair(index, role)](item); + QVariant ret = getters[QPair(index.column(), role)](item); return ret; // Bouml preserved body end 00203B2A } template -bool ItemController::SetValue(T * item, int column, const QVariant & value, int role) +bool ItemController::SetValue(T * item, const QModelIndex & index, const QVariant & value, int role) { // Bouml preserved body begin 00203BAA - if(!setters.contains(QPair(column, role))) + if(!setters.contains(QPair(index.column(), role))) return false; - return setters[QPair(column, role)](item, value); + bool result = setters[QPair(index.column(), role)](item, value); + if(postProcessors.contains(QPair(index.column(), role)) && postProcessors[QPair(index.column(), role)] != 0) + postProcessors[QPair(index.column(), role)](item, index); + return result; // Bouml preserved body end 00203BAA } @@ -144,6 +152,25 @@ void ItemController::AddSetter(int row, const QVector & roles, std::func // Bouml preserved body end 00230D2A } +template +void ItemController::AddPostProcessor(int column, int role, std::function _postProcessor) +{ + // Bouml preserved body begin 002327AA + postProcessors.insert(QPair(column,role), _postProcessor); + // Bouml preserved body end 002327AA +} + +template +void ItemController::AddPostProcessors(int column, QVector roles, std::function _postProcessor) +{ + // Bouml preserved body begin 0023272A + for(int role : roles) + { + AddPostProcessor(column, role, _postProcessor); + } + // Bouml preserved body end 0023272A +} + template Qt::ItemFlags ItemController::flags(const QModelIndex & index) const { diff --git a/src/Libs/L_UniversalModels/include/TreeItem.h b/src/Libs/L_UniversalModels/include/TreeItem.h index be238e3d3..d0efd0f05 100644 --- a/src/Libs/L_UniversalModels/include/TreeItem.h +++ b/src/Libs/L_UniversalModels/include/TreeItem.h @@ -6,9 +6,9 @@ #include #include "TreeItemInterface.h" #include +#include #include "ItemController.h" #include -#include #include "l_tree_controller_global.h" @@ -33,7 +33,7 @@ typedef TreeItem value_type; virtual int childCount() const; - virtual QVariant data(int column, int role); + virtual QVariant data(const QModelIndex & index, int role); virtual bool isCheckable() const; @@ -41,7 +41,7 @@ typedef TreeItem value_type; virtual Qt::CheckState checkState(); - virtual bool setData(int column, const QVariant & value, int role); + virtual bool setData(const QModelIndex & index, const QVariant & value, int role); virtual bool removeChildren(int position, int count); @@ -65,7 +65,7 @@ typedef TreeItem value_type; void* InternalPointer(); - virtual void* InternalPointer() const; + void* InternalPointer() const; virtual TreeItemInterface* child(int row); @@ -157,10 +157,10 @@ int TreeItem::childCount() const } template -QVariant TreeItem::data(int column, int role) +QVariant TreeItem::data(const QModelIndex & index, int role) { // Bouml preserved body begin 00203FAA - return controller->GetValue(m_data, column, role); + return controller->GetValue(m_data, index, role); // Bouml preserved body end 00203FAA } @@ -189,10 +189,10 @@ Qt::CheckState TreeItem::checkState() } template -bool TreeItem::setData(int column, const QVariant & value, int role) +bool TreeItem::setData(const QModelIndex & index, const QVariant & value, int role) { // Bouml preserved body begin 00203D2A - controller->SetValue(m_data, column,value, role); + controller->SetValue(m_data, index,value, role); return true; // Bouml preserved body end 00203D2A } @@ -299,9 +299,9 @@ void* TreeItem::InternalPointer() template void* TreeItem::InternalPointer() const { - // Bouml preserved body begin 0022F42A + // Bouml preserved body begin 0023282A return m_data; - // Bouml preserved body end 0022F42A + // Bouml preserved body end 0023282A } template diff --git a/src/Libs/L_UniversalModels/include/TreeItemInterface.h b/src/Libs/L_UniversalModels/include/TreeItemInterface.h index 37a4cfd6c..95826813b 100644 --- a/src/Libs/L_UniversalModels/include/TreeItemInterface.h +++ b/src/Libs/L_UniversalModels/include/TreeItemInterface.h @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include "l_tree_controller_global.h" @@ -29,7 +29,7 @@ class L_TREE_CONTROLLER_EXPORT TreeItemInterface virtual int columnCount() const = 0; - virtual QVariant data(int column, int role) = 0; + virtual QVariant data(const QModelIndex & index, int role) = 0; virtual bool isCheckable() const = 0; @@ -37,7 +37,7 @@ class L_TREE_CONTROLLER_EXPORT TreeItemInterface virtual Qt::CheckState checkState() = 0; - virtual bool setData(int column, const QVariant & value, int role) = 0; + virtual bool setData(const QModelIndex & index, const QVariant & value, int role) = 0; virtual bool removeChildren(int position, int count) = 0; diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp index ba1f92bc0..1c6905782 100644 --- a/src/Libs/L_UniversalModels/src/TreeModel.cpp +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -56,7 +56,7 @@ QVariant TreeModel::data(const QModelIndex & index, int role) const return static_cast< int >( item->checkState() ? Qt::Checked : Qt::Unchecked ); if(role == Qt::DisplayRole || role == Qt::EditRole || role == Qt::DecorationRole) - return item->data(index.column(),role); + return item->data(index,role); // if(role == Qt::DecorationRole ) // return item->data(index.column(),role); @@ -91,7 +91,7 @@ bool TreeModel::setData(const QModelIndex & index, const QVariant & value, int r if(role==Qt::EditRole) { TreeItemInterface* item = dynamic_cast(getItem(index)); - bool result = item->setData(index.column(), value, role); + bool result = item->setData(index, value, role); if (result) { diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index 764566688..d90578d0d 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -30,8 +30,10 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove { BrowserOperation* operation = nullptr; ParamData* data = nullptr; + public: BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, ParamData* _data); + BrowserOperation* get_operation(){return operation;} void set_name(QString); QString get_name() const; void set_direction(QString); diff --git a/src/browserfunctions/operationfuncs.cpp b/src/browserfunctions/operationfuncs.cpp new file mode 100644 index 000000000..33a13ff13 --- /dev/null +++ b/src/browserfunctions/operationfuncs.cpp @@ -0,0 +1,373 @@ +#include "operationfuncs.h" +#include "BrowserOperation.h" +#include "BrowserClass.h" +#include "OperationData.h" +#include "DialogUtil.h" +#include "GenerationSettings.h" + + + + +void add_param(BrowserOperation* oper, QString & form, int rank, QString s) +{ + int index = param_begin(form, rank); + + if (index == -1) + return; + + if (rank == 0) { + // first param, index point to '}' ending ${(} + OperationData* data = static_cast(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, QString s) +{ + int index_start = param_begin(form, rank); + + if (index_start == -1) + return; + + const char * p = form; + + 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(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.find(t) == -1) && (cppDecl.find(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.find(t) == -1) && (cppDef.find(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.find(t) == -1) && (javaDef.find(p) == -1)) + { + add_param(oper, javaDef, rank, QString(t) + QString(" ") + QString(p)); + data->set_javadef(javaDef); + } + + + + QString phpDef = data->get_phpdef(); + + if (phpDef.find(p) == -1) + { + add_param(oper, phpDef, rank, QString(p) + QString(v)); + data->set_phpdef(phpDef); + } + + + + + QString pythonDef = data->get_pythondef(); + + if (pythonDef.find(p) == -1) { + add_param(oper, pythonDef, rank, QString(p) + QString(v)); + data->set_pythondef(pythonDef); + } + + + + + + QString idlDecl = data->get_idldecl(); + if ((idlDecl.find(t) == -1) && (idlDecl.find(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(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; +} + +void renumber(QString & form, int rank, + int delta, bool equal ) +{ + 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; + } + } +} diff --git a/src/browserfunctions/operationfuncs.h b/src/browserfunctions/operationfuncs.h new file mode 100644 index 000000000..0d1e1c9fd --- /dev/null +++ b/src/browserfunctions/operationfuncs.h @@ -0,0 +1,18 @@ +#ifndef OPERATIONFUNCS_H +#define OPERATIONFUNCS_H +#include +class BrowserOperation; +void add_param(BrowserOperation* oper, QString & form, int rank, QString s); +void replace_param( QString & form, int rank, 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(QString s, int rank); +void renumber(QString & form, int rank, + int delta, bool equal = FALSE); + +#endif // OPERATIONFUNCS_H diff --git a/src/data/OperationData.h b/src/data/OperationData.h index eb3d77fc9..a0725adf5 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -296,27 +296,32 @@ class OperationData : public ClassMemberData, 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); diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index f9d3e4d7c..fb5518c73 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -38,8 +38,9 @@ #include #include #include +#include #include -#include "Libs/L_UniversalModels/include/ItemController.h" +//#include "Libs/L_UniversalModels/include/ItemController.h" class Q3CanvasView; class QWorkspace; diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 95597e51f..4991b64de 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -84,6 +84,8 @@ #include "ui_operationwidgetcpp.h" #include "Tools/SignalBlockerWrapper.h" #include "CustomWidgets/EdgeMenuToolBar.h" +#include "browserfunctions/operationfuncs.h" + QSize OperationDialog::previous_size; QSharedPointer OperationDialog::instance; OperationDialog::OperationDialog(OperationData * o, DrawingLanguage ) @@ -3387,7 +3389,7 @@ bool OperationDialog::SaveData(OperationData *oper) 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(); @@ -3399,6 +3401,7 @@ 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)); @@ -4372,220 +4375,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) { diff --git a/src/douml.pro b/src/douml.pro index 9c0fa7f28..04d06b22c 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -238,7 +238,8 @@ HEADERS = \ dialog/GenerationSettingsBuiltinTable.h \ CustomWidgets/quickedit.h \ browser/BrowserOperationAttribute.h \ - CustomWidgets/GenericDelegate.h + CustomWidgets/GenericDelegate.h \ + browserfunctions/operationfuncs.h SOURCES = \ @@ -524,7 +525,8 @@ SOURCES = \ CustomWidgets/quickedit.cpp \ browser/BrowserOperationAttribute.cpp \ CustomWidgets/GenericDelegate.cpp \ - CustomWidgets/quickeditcontrollersetup.cpp + CustomWidgets/quickeditcontrollersetup.cpp \ + browserfunctions/operationfuncs.cpp TARGET = douml DEFINES = BooL=bool DEBUGCOM From 516c6a5b24db733c7e425675e62826c42a142867 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 10 Mar 2013 17:48:23 +0400 Subject: [PATCH 052/297] filtering now keeps all nodes below node matching the check --- src/CustomWidgets/quickedit.cpp | 2 +- src/Libs/L_UniversalModels/include/treeitemfunctions.h | 7 ++++--- .../L_UniversalModels/include/treeviewtemplatefunctions.h | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 9803121c0..b912e02cf 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -109,7 +109,7 @@ void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, Tre TreeFunctions::FilterTreeAndRestoreNodes (dataAccessFunc, checksFunc, - expandedNodes, view, model, interface, false); + expandedNodes, view, model, interface,false, true); } void QuickEdit::OnContextMenu(QPoint point) diff --git a/src/Libs/L_UniversalModels/include/treeitemfunctions.h b/src/Libs/L_UniversalModels/include/treeitemfunctions.h index 2f1ed041f..82fcaeb3a 100644 --- a/src/Libs/L_UniversalModels/include/treeitemfunctions.h +++ b/src/Libs/L_UniversalModels/include/treeitemfunctions.h @@ -56,7 +56,8 @@ QSharedPointer RecursiveGetSubset(InterfaceType* rootItem, RootCh { for(QSharedPointer child: rootItem->GetChildren()) { - QSharedPointer newChild = RecursiveGetSubset(child.data(), filterFunctions, nodeValid && forceChildren, forceChildren); + forcePick = (forcePick || nodeValid) && forceChildren; + QSharedPointer newChild = RecursiveGetSubset(child.data(), filterFunctions, forcePick, forceChildren); if(!newChild.isNull()) newChildren += newChild; } @@ -185,13 +186,13 @@ QList RecursiveGet(T* rootItem, std::function accessor) * @filterFunctions список проверок которым должна удовлетворять нода **/ template class ItemType, typename DataType> -QSharedPointer FilterSubset(QSharedPointer rootItem, QList > filterFunctions, bool forceChildren = true) +QSharedPointer FilterSubset(QSharedPointer rootItem, QList > filterFunctions, bool forceRoot = false, bool forceChildren = true) { QSharedPointer item; ItemType* newRoot = new ItemType(0); item = QSharedPointer(newRoot); - item = TreeFunctions::RecursiveGetSubset>(rootItem.data(), filterFunctions, false, forceChildren); + item = TreeFunctions::RecursiveGetSubset>(rootItem.data(), filterFunctions, forceRoot, forceChildren); return item; } diff --git a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h index b2c63f316..6e2cfbfd7 100644 --- a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h +++ b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h @@ -181,14 +181,14 @@ TreeItemType* AddItem(std::function dataGenerator template class ItemType, typename DataType> bool PerformFiltering(TreeModel* treeModel, QSharedPointer rootItem, - std::function > ()> createCheckListFunc, bool forceChildren = true) + std::function > ()> createCheckListFunc,bool forceRoot = false, bool forceChildren = true) { QSharedPointer item; QList > checkList = createCheckListFunc(); if(checkList.isEmpty()) item = rootItem; else - item = TreeFunctions::FilterSubset(rootItem, checkList, forceChildren); + item = TreeFunctions::FilterSubset(rootItem, checkList, forceRoot, forceChildren); treeModel->InsertRootItem(item); if(item == rootItem) return false; @@ -327,10 +327,10 @@ void FilterTreeAndRestoreNodes(std::function dataAccessor, QStringList & nodes, QTreeView * view, TreeModel * model, - QSharedPointer startIndex, bool forceChildren = true) + QSharedPointer startIndex, bool forceRoot = false, bool forceChildren = true) { TreeFunctions::StoreNodePathExpandState(dataAccessor, nodes, view, model, QModelIndex()); - PerformFiltering(model,startIndex,createCheckListFunc, forceChildren); + PerformFiltering(model,startIndex,createCheckListFunc, forceRoot, forceChildren); TreeFunctions::ApplyNodePathExpandState(dataAccessor, nodes, view, model, QModelIndex()); } } From 11e623902e4e09ce14939ca9d558524a3b0db610 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 10 Mar 2013 19:49:14 +0400 Subject: [PATCH 053/297] can now easily control tree expand state --- src/CustomWidgets/quickedit.cpp | 62 +++++++++++++++--- src/CustomWidgets/quickedit.h | 22 +++++-- src/CustomWidgets/quickedit.ui | 26 +++++++- .../include/treeviewtemplatefunctions.h | 39 +++++++++++ src/icons/arrow_redo.png | Bin 0 -> 1303 bytes src/icons/arrow_undo.png | Bin 0 -> 1336 bytes 6 files changed, 134 insertions(+), 15 deletions(-) create mode 100644 src/icons/arrow_redo.png create mode 100644 src/icons/arrow_undo.png diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index b912e02cf..1c4449e7b 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -136,6 +136,20 @@ void QuickEdit::OnPerformFiltering(QString) TreeFunctions::ExpandAllSatisfying(check, ui->tvEditor, treeModel, QModelIndex()); } +void QuickEdit::OnDecreaseOpenLevels() +{ + int level = TreeFunctions::MaxOpenLevel(ui->tvEditor, treeModel, QModelIndex()); + level--; + TreeFunctions::ExpandUpToLevel(ui->tvEditor, treeModel, QModelIndex(),level); +} + +void QuickEdit::OnIncreaseOpenLevels() +{ + int level = TreeFunctions::MaxOpenLevel(ui->tvEditor, treeModel, QModelIndex()); + level++; + TreeFunctions::ExpandUpToLevel(ui->tvEditor, treeModel, QModelIndex(),level); +} + void QuickEdit::CreateMenu() { @@ -152,13 +166,6 @@ void QuickEdit::CreateMenu() void QuickEdit::SetupItemCreationFuncs() { - // itemCreators.insert(UmlAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); - // itemCreators.insert(UmlAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2));/*composition?*/ - // itemCreators.insert(UmlDirectionalAggregation, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); - // itemCreators.insert(UmlDirectionalAggregationByValue, std::bind(CreateItemsForAggregation, this, std::placeholders::_1, std::placeholders::_2)); - //void QuickEdit::AssignItemsForClass(QSharedPointer root, BrowserNode * classNode) - - //std::function<> 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)); @@ -167,6 +174,8 @@ void QuickEdit::SetupItemCreationFuncs() 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)); } QList > QuickEdit::CreateCheckList() @@ -219,7 +228,7 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) //validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, // UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, - UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; + UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember, UmlClassView, UmlPackage}; //validTypes = {UmlClass, UmlOperation, UmlAttribute}; SetupItemCreationFuncs(); @@ -233,6 +242,8 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) 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())); } void QuickEdit::Show(BrowserNode * node) @@ -313,6 +324,41 @@ void QuickEdit::AssignItemsForExtraNode(QSharedPointer root, { QSharedPointer interfaceItem = CreateInterfaceNode(root, extraNodeController, extraNode); root->AddChildren(QList >() << interfaceItem); + +} + +void QuickEdit::AssignItemsForClassView(QSharedPointer root, BrowserNode * classViewNode) +{ + QSharedPointer interfaceItem = CreateInterfaceNode(root, classController, classViewNode); + + QList children = classViewNode->children(validTypes); + std::reverse(children.begin(), children.end()); + for(BrowserNode* child : children) + { + if(!child) + continue; + UmlCode nodeType = child->get_type(); + itemCreators[nodeType](root, child); + } +// root->AddChildren(QList >() << interfaceItem); + +} + +void QuickEdit::AssignItemsForPackage(QSharedPointer root, BrowserNode * packageNode) +{ + + QSharedPointer interfaceItem = CreateInterfaceNode(root, classController, packageNode); + + QList children = packageNode->children(validTypes); + std::reverse(children.begin(), children.end()); + for(BrowserNode* child : children) + { + if(!child) + continue; + UmlCode nodeType = child->get_type(); + itemCreators[nodeType](root, child); + } +// root->AddChildren(QList >() << interfaceItem); } void QuickEdit::AssignItemsForOperation(QSharedPointer root, BrowserNode * node) diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 65de663a7..4b292dc86 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -57,6 +57,8 @@ class QuickEdit : public QWidget QSharedPointer > operationAttributeController; QSharedPointer > relationController; QSharedPointer > extraNodeController; + QSharedPointer > classviewController; + QSharedPointer > packageController; QSharedPointer classInterface; QSharedPointer operationInterface; @@ -65,13 +67,17 @@ class QuickEdit : public QWidget QSharedPointer operationAttributeInterface; QSharedPointer relationInterface; QSharedPointer extraNodeInterface; + QSharedPointer classviewInterface; + QSharedPointer packageInterface; - std::function classFlagFunctor; - std::function operationFlagFunctor; - std::function attributeFlagFunctor; - std::function operationReturnTypeFlagFunctor; - std::function operationAttributeFlagFunctor; - std::function extraNodeFlagFunctor; +// std::function classFlagFunctor; +// std::function operationFlagFunctor; +// std::function attributeFlagFunctor; +// std::function operationReturnTypeFlagFunctor; +// std::function operationAttributeFlagFunctor; +// std::function extraNodeFlagFunctor; +// QSharedPointer > classviewFlagFunctor; +// QSharedPointer > packageFlagFunctor; void SetupTreeModel(TreeModel*& , QTreeView*, @@ -104,12 +110,16 @@ class QuickEdit : public QWidget void AssignItemsForAttribute(QSharedPointer root,BrowserNode*); void AssignItemsForRelation(QSharedPointer root, BrowserNode * classNode); void AssignItemsForExtraNode(QSharedPointer root,BrowserNode*); + void AssignItemsForClassView(QSharedPointer root,BrowserNode*); + void AssignItemsForPackage(QSharedPointer root,BrowserNode*); // void AssignItemsForAggregation(QSharedPointer root,BrowserNode*); public slots: void OnContextMenu(QPoint); void OnShow(); void OnPerformFiltering(QString); + void OnDecreaseOpenLevels(); + void OnIncreaseOpenLevels(); //void OnPerformFiltering(QString); }; diff --git a/src/CustomWidgets/quickedit.ui b/src/CustomWidgets/quickedit.ui index 3b6df672b..26d9683f0 100644 --- a/src/CustomWidgets/quickedit.ui +++ b/src/CustomWidgets/quickedit.ui @@ -19,6 +19,28 @@ + + + + + + + + :/root/icons/next_folder.png:/root/icons/next_folder.png + + + + + + + + + + + :/root/icons/previous folder.png:/root/icons/previous folder.png + + + @@ -97,6 +119,8 @@ - + + + diff --git a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h index 6e2cfbfd7..5d7d7c6e3 100644 --- a/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h +++ b/src/Libs/L_UniversalModels/include/treeviewtemplatefunctions.h @@ -321,6 +321,45 @@ bool ExpandAllSatisfying(std::function check, return returnResult; } + +static 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 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 class ItemType, typename DataType> void FilterTreeAndRestoreNodes(std::function dataAccessor, std::function > ()> createCheckListFunc, diff --git a/src/icons/arrow_redo.png b/src/icons/arrow_redo.png new file mode 100644 index 0000000000000000000000000000000000000000..a05f1a3854fd8a1c6f8f3ada755698a72a46da4b GIT binary patch literal 1303 zcmV+y1?c*TP)lHhBjj09spJcGYMxO-{?Mw6Z?+BXs-Z*Gr&p&2rmFe1}fY_ z5Dad#@+6z7s&cK$`;8t-V+PKj1_oZipqfTMPsO)AC;=?qydBP<`~@YAO`SNo_f_;% zHZUml_fy~1unb~ghPE=E(@FFSZ7jOEkV_0T!AO*?m}fe70}Gddk6wd!aukQE+!zZ7 zfk+rnRJWnuKZ*YJ0J`eCF#OVoC|qQwzfRHvq&mYOj&f>EO%qWD<6nbCg3#$?=9!e- z&jE^&tr)?0b^&!{@Z+OUzdM6{YY{y3>^m4(3IN0J!l>lTmQJC$c|U&aJOb0)b)uXn z&1F(&B_o52&z8A}d!#qP0D6m*K-?Fe5FkWh=h#WBlEHEp&`Mc`j`8^cpzmeiSPw3H zzeQWtrzRUZ+`SlSIRMiQQl`+|rQ1m5G8y1YEDlMJSPSP{YN&Ow%r?cf(JZr%hNLMo z0*p=qaqw=K$xM)qju!};RWm-uvYml?y9{}`qtb)I5Va1|AkJEumAP1EwK^{W6jcFh zw}9V9nOPufzEETtX`XSo+Mus{OtKSOmJA56I#!6)#`C4o6B1gNl98z|;SWyX5KHoGVB&B4#`f|C zy#M%dblaUUCSo#yEC@v=p{Hl&egZBGz!$s<_xf+ao~dDk#et-7JAbWc1TKC6-?a7)-fBOLzM@LWpfG7VBMmF)7P1I191$U3u3L*XVqyKV=n$rx zUz{Gp7miAp0+V3TfZj&AruUlWos>2c+P;fHhg=V%-B}0BUXiB^R;`57vZSr0%%0_I z-->w7gjx@SAf=7-dF|Ojnhf;7*IIB^G$;-P2PW;V2u_}GKUdowThYTZRLEipO<}88m(j(w7t8(b4A*o z$Y@am&pJTzuJ@*-8?v#YTGI2{-hVoD|MZNK|Gyv)AP?Yw58w|01_04trD9qo{}ccK N002ovPDHLkV1nFSSET>| literal 0 HcmV?d00001 diff --git a/src/icons/arrow_undo.png b/src/icons/arrow_undo.png new file mode 100644 index 0000000000000000000000000000000000000000..66ccde94e7d3c725e23376c3c217d9bf46c96d11 GIT binary patch literal 1336 zcmV-81;_e{P)s|2Plubq47F!0M~Kx7KdwcD}3wgJ1Uw*qz-Fg*rjmI2j*i9{5G z!)I^~d5ku90k%5;|7jqxus#6wZz-b3O$Le1;icBcaAfxrsCQHV-Z~(k0n!X^B9F5Z zKzIT#nDe+8xPUKb$MLzZ9zn(YFB#x!^t@=but33zIO_#Du80-1qNbr8oL<#PS%%S`0eTkgZD*bGvN z2?2|Z3+M4bQwzR-)X2i@@*bj$?tE8QY%7%-V&>3$g*_h#VKtLU{lap}SR=zIDE)F3nPpXU#0G^cPT z07fe0I5tZr@_EkDvMX|4b8wFL7=f7RYazdPHIZF1^Y(LC9vcJ;iNQY@pcUx!_>p%} zqgA7uW#~D049d_jOA!DnsC3OH=@x-RszR8mCc%inSqjl&=PSNXQt`PJ=_i^z&C*R? z0%oSk#v{~!%-6dL#boL)Z!v8Ja1L~T*)q*qNe=c;6s+{_^mcnJliqa){8pt4gyF@XThnUUwCMw zG#)|byQ3Hgjo?Mjj{j9pZ{Df5-d;~VPS)>(Z=M-z6tCzkAH3<5Nx0eLs$zk{ zO-Un&Jh$5%MN^=v7sx`9yXF~|N0j2K0YsAp15*G`6i`iIb0Wm@cJQU^JN$LNB5`Yqb|2=@;1sDJ--pcnSAW6Oe0000 Date: Sun, 10 Mar 2013 20:01:44 +0400 Subject: [PATCH 054/297] minor interface changes --- src/CustomWidgets/quickedit.ui | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/CustomWidgets/quickedit.ui b/src/CustomWidgets/quickedit.ui index 26d9683f0..bfa3c503e 100644 --- a/src/CustomWidgets/quickedit.ui +++ b/src/CustomWidgets/quickedit.ui @@ -42,13 +42,23 @@ - + + + + + + false + + + + false + Previous Item @@ -56,16 +66,19 @@ + + false + Next Item - - - + + false + C++ @@ -73,6 +86,9 @@ + + false + Java @@ -80,6 +96,9 @@ + + false + Python @@ -87,6 +106,9 @@ + + false + Php @@ -94,6 +116,9 @@ + + false + Idl From 730370666d330f7b6c9ac289e07f59cd861f28a1 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 10 Mar 2013 20:15:21 +0400 Subject: [PATCH 055/297] changelog changed --- README.md | 3 ++- changelog.txt | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cc7b64db..a20dbd34e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -DoUML version 1.0b2 +DoUML version 1.0b4 ================== *** IMPORTANT NOTICE *** @@ -115,6 +115,7 @@ Enchancements: * 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 Manual ------ diff --git a/changelog.txt b/changelog.txt index c9bedaebb..10543a636 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,24 @@ +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: + 1) you can quickly search for classes/operation etc... by entering text in lineedit on the top. It even picks operation parameters! + 2) two buttons to the left of the search lineedit allow you to expand/collapse whole levels in the tree + 3) "Type" of an operation node is actually its return type. + 4) Nodes below operations are their parameters + 5) Changes made into editable cells are IMMEDIATELY done to the model. So far there is no rollback once you've edited something. + 6) 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 +Bugfixes + App entered endless cycle while trying to open some diagrams. Fixed + + v1.0b2 Changes From 67c6ecaeabab866e00dc5034a7e15edbaad1945b Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 11 Mar 2013 23:53:57 +0400 Subject: [PATCH 056/297] 1. Added most of important C++ modifiers to quick edit. Now only pass type and parameter constness are left 2. Quickedit will remember columns sizes and visibility between sessions --- bin/settings.ini | 10 ++ src/CustomWidgets/quickedit.cpp | 102 ++++++++++++++++-- src/CustomWidgets/quickedit.h | 8 ++ src/CustomWidgets/quickedit.ui | 2 +- .../quickeditcontrollersetup.cpp | 60 +++++++---- src/Libs/L_UniversalModels/src/TreeModel.cpp | 8 +- src/data/OperationData.h | 62 +++++++++-- 7 files changed, 206 insertions(+), 46 deletions(-) diff --git a/bin/settings.ini b/bin/settings.ini index 3a3bf3ecf..53744e9fd 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -8,3 +8,13 @@ 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" + +[headers] +quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6}\0\0\0\x14\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x14\0\0\0¶\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x2\x13\0\0\0\x1\0\0\0\0)" + +[quickedit_checkboxes] +cpp=true +java=false +php=false +python=false +idl=false diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 1c4449e7b..60d84dde9 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -25,6 +25,8 @@ #include #include +#include +#include #include #include #include @@ -129,7 +131,7 @@ void QuickEdit::OnShow() void QuickEdit::OnPerformFiltering(QString) { PerformFiltering(expandedNodes, ui->tvEditor, treeModel, rootInterface); - std::function check = [&](TreeItemInterface* interface) + std::function check = [&](TreeItemInterface* ) { return true; }; @@ -150,6 +152,16 @@ void QuickEdit::OnIncreaseOpenLevels() TreeFunctions::ExpandUpToLevel(ui->tvEditor, treeModel, QModelIndex(),level); } +void QuickEdit::OnNewSectionSizes(int, int, int) +{ + +} + +void QuickEdit::OnChangeColumnVisibility() +{ + CheckColumnVisibility(); +} + void QuickEdit::CreateMenu() { @@ -178,6 +190,41 @@ void QuickEdit::SetupItemCreationFuncs() itemCreators.insert(UmlPackage, std::bind(&QuickEdit::AssignItemsForPackage, this, std::placeholders::_1, std::placeholders::_2)); } +void QuickEdit::CheckColumnVisibility() +{ +// columns << "name" << "type" << "default_value" << "stereotype" +// << "visibility" << "static" << "abstract" << "multiplicity" << "direction" +// << "pass" +// << "const" << "volatile" << "friend" << "virtual" << "inline" +// << "default" << "delete" << "override" << "final" << "noexcept"; + if(ui->chkCpp->isChecked()) + { + ui->tvEditor->header()->setSectionHidden(columns.indexOf("pass"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("const"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("volatile"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("friend"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("virtual"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("inline"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("default"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("delete"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("override"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("final"),false); + } + else + { + ui->tvEditor->header()->setSectionHidden(columns.indexOf("pass"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("const"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("volatile"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("friend"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("virtual"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("inline"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("default"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("delete"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("override"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("final"),true); + } +} + QList > QuickEdit::CreateCheckList() { QList > result; @@ -230,7 +277,11 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember, UmlClassView, UmlPackage}; //validTypes = {UmlClass, UmlOperation, UmlAttribute}; - + columns << "name" << "type" << "default_value" << "stereotype" + << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + << "pass" + << "const" << "volatile" << "friend" << "virtual" << "inline" + << "default" << "delete" << "override" << "final" << "noexcept"; SetupItemCreationFuncs(); qRegisterMetaType>("QList"); SetupControllers(); @@ -244,6 +295,9 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) 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->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) @@ -263,21 +317,46 @@ void QuickEdit::Show(BrowserNode * node) itemCreators[nodeType](rootInterface, node); // we then assign items and all is ok treeModel->InsertRootItem(rootInterface); - ui->tvEditor->resizeColumnToContents(0); - ui->tvEditor->resizeColumnToContents(1); - ui->tvEditor->resizeColumnToContents(2); - std::function check = [&](TreeItemInterface* interface) + std::function check = [&](TreeItemInterface* ) { return true; }; TreeFunctions::ExpandAllSatisfying(check, ui->tvEditor, treeModel, QModelIndex()); - + QSettings settings("settings.ini", QSettings::IniFormat); + 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()); + + CheckColumnVisibility(); this->showMaximized(); } +void QuickEdit::closeEvent(QCloseEvent *) +{ + QSettings settings("settings.ini", QSettings::IniFormat); + 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()); +} + QSharedPointer QuickEdit::CreateInterfaceNode(QSharedPointer root, QSharedPointer > controller, BrowserNode * node ) { @@ -418,6 +497,15 @@ void QuickEdit::CheckBoxDelegateSetup() checkboxDelegate->editorEventProcessor = editorEvent; ui->tvEditor->setItemDelegateForColumn(staticIndex, checkboxDelegate); ui->tvEditor->setItemDelegateForColumn(abstractIndex, 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("default"), checkboxDelegate); + ui->tvEditor->setItemDelegateForColumn(columns.indexOf("delete"), checkboxDelegate); + ui->tvEditor->setItemDelegateForColumn(columns.indexOf("override"), checkboxDelegate); + ui->tvEditor->setItemDelegateForColumn(columns.indexOf("final"), checkboxDelegate); } diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 4b292dc86..c6e23ea3b 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -32,6 +32,9 @@ class QuickEdit : public QWidget void Init(UmlWindow* window, BrowserView* view); void Show(BrowserNode*); +protected: + void closeEvent(QCloseEvent *) override; + private: Ui::QuickEdit *ui = nullptr; BrowserView* dummyView = nullptr; @@ -70,6 +73,8 @@ class QuickEdit : public QWidget QSharedPointer classviewInterface; QSharedPointer packageInterface; + + QStringList columns; // std::function classFlagFunctor; // std::function operationFlagFunctor; // std::function attributeFlagFunctor; @@ -103,6 +108,7 @@ class QuickEdit : public QWidget void DirectionDelegateSetup(); void CheckBoxDelegateSetup(); void SetupItemCreationFuncs(); + void CheckColumnVisibility(); QSharedPointer CreateInterfaceNode(QSharedPointer root, QSharedPointer > controller, BrowserNode *node); void AssignItemsForOperation(QSharedPointer root,BrowserNode*); @@ -120,6 +126,8 @@ class QuickEdit : public QWidget void OnPerformFiltering(QString); void OnDecreaseOpenLevels(); void OnIncreaseOpenLevels(); + void OnNewSectionSizes(int,int,int); + void OnChangeColumnVisibility(); //void OnPerformFiltering(QString); }; diff --git a/src/CustomWidgets/quickedit.ui b/src/CustomWidgets/quickedit.ui index bfa3c503e..b186a4a04 100644 --- a/src/CustomWidgets/quickedit.ui +++ b/src/CustomWidgets/quickedit.ui @@ -77,7 +77,7 @@ - false + true C++ diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index ef5740554..00f13e384 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -215,9 +215,7 @@ template std::array in(T0 arg0, T...arg void QuickEdit::SetupClassController() { classController = QSharedPointer >( new ItemController()); - classController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); + classController->SetColumns(columns); ADD_GETSET(BrowserClass, classController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), @@ -281,9 +279,7 @@ void QuickEdit::SetupClassController() void QuickEdit::SetupOperationController() { operationController = QSharedPointer >( new ItemController()); - operationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); + operationController->SetColumns(columns); ADD_GETSET(BrowserOperation, operationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), @@ -301,16 +297,44 @@ void QuickEdit::SetupOperationController() ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_is_abstract, set_is_abstract); + //data->get_cpp_name_spec(); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("const"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_const, set_cpp_const); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("volatile"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_is_volatile, set_is_volatile); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("friend"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_friend, set_cpp_friend); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("virtual"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_virtual, set_cpp_virtual); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("inline"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_inline, set_cpp_inline); + //"default" << "delete" << "override" << "final" << "noexcept"; + + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_default, set_cpp_default); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("delete"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_delete, set_cpp_delete); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("override"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_override, set_cpp_override); + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("final"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool,get_cpp_final, set_cpp_final); +// ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("noexcept"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// toBool,get_cpp_const, set_cpp_const); + + + ADD_PIXMAP_GETTER(BrowserOperation, operationController, nameIndex,std::initializer_list({Qt::DecorationRole}), pixmap); operationController->AddFlagsFunctor ( - [](const QModelIndex& index) + [&](const QModelIndex& index) { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,staticIndex,visibilityIndex,abstractIndex))) + if(!(index.column() *in(nameIndex,typeIndex,staticIndex,visibilityIndex,abstractIndex, + columns.indexOf("const"), columns.indexOf("volatile"),columns.indexOf("friend"),columns.indexOf("virtual"),columns.indexOf("inline") + ,columns.indexOf("default"),columns.indexOf("delete"),columns.indexOf("override"),columns.indexOf("final")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -330,9 +354,7 @@ void QuickEdit::SetupOperationController() void QuickEdit::SetupAttributeController() { attributeController = QSharedPointer >( new ItemController()); - attributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); + attributeController->SetColumns(columns); ADD_GETSET(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), @@ -352,6 +374,10 @@ void QuickEdit::SetupAttributeController() ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_isa_class_attribute, set_isa_class_attribute); + + + + ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); attributeController->AddFlagsFunctor @@ -380,9 +406,7 @@ void QuickEdit::SetupAttributeController() void QuickEdit::SetupOperationAttributeController() { operationAttributeController = QSharedPointer >( new ItemController()); - operationAttributeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); + operationAttributeController->SetColumns(columns); ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), @@ -433,9 +457,7 @@ void QuickEdit::SetupOperationAttributeController() void QuickEdit::SetupRelationController() { relationController = QSharedPointer >( new ItemController()); - relationController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); + relationController->SetColumns(columns); ADD_GETSET(BrowserRelation, relationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); @@ -532,9 +554,7 @@ void QuickEdit::SetupExtraNodeController() { extraNodeController = QSharedPointer >( new ItemController()); - extraNodeController->SetColumns(QStringList() << "name" << "type" << "default_value" << "stereotype" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - ); + extraNodeController->SetColumns(columns); ADD_GETSET(BrowserExtraMember, extraNodeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp index 1c6905782..f10fd41c9 100644 --- a/src/Libs/L_UniversalModels/src/TreeModel.cpp +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -60,13 +60,7 @@ QVariant TreeModel::data(const QModelIndex & index, int role) const // if(role == Qt::DecorationRole ) // return item->data(index.column(),role); - if(role == Qt::ForegroundRole) - { - if(index.sibling(index.row(), 14).data().toBool() == true) - return QColor(Qt::lightGray); - if(index.sibling(index.row(), 15).data().toBool() == true) - return QColor(Qt::darkGreen); - } + if(role == Qt::SizeHintRole) return QSize(100, 20); return QVariant(); diff --git a/src/data/OperationData.h b/src/data/OperationData.h index a0725adf5..90fd563e2 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -192,8 +192,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; }; @@ -201,51 +203,89 @@ 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 { From 24aa92063081edca89ff91c2a6da53785fe45796 Mon Sep 17 00:00:00 2001 From: zeks Date: Fri, 15 Mar 2013 00:46:09 +0400 Subject: [PATCH 057/297] param fixing --- bin/settings.ini | 2 +- src/CustomWidgets/quickedit.cpp | 32 ++++ src/CustomWidgets/quickedit.h | 6 + src/CustomWidgets/quickedit.ui | 29 +++- src/browser/BrowserClass.cpp | 6 + src/browser/BrowserClass.h | 1 + src/browser/BrowserNode.cpp | 5 + src/browser/BrowserNode.h | 3 +- src/browser/BrowserOperationAttribute.cpp | 5 + src/browser/BrowserOperationAttribute.h | 1 + src/data/OperationData.cpp | 172 ++++++++++------------ src/data/OperationData.h | 4 +- src/dialog/OperationDialog.cpp | 6 +- 13 files changed, 167 insertions(+), 105 deletions(-) diff --git a/bin/settings.ini b/bin/settings.ini index 53744e9fd..222a707c6 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,7 +10,7 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Import XMI 2.x,Generate XMI 2.x,Generate XMI 1.2,Generate .pro" [headers] -quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6}\0\0\0\x14\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x14\0\0\0¶\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x2\x13\0\0\0\x1\0\0\0\0)" +quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6}\0\0\0\x14\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x14\0\0\0Û\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x1î\0\0\0\x1\0\0\0\0)" [quickedit_checkboxes] cpp=true diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 60d84dde9..9b1b69295 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -12,6 +12,7 @@ #include "browser/BrowserNodeDummy.h" #include "browser/BrowserAttribute.h" #include "browser/BrowserRelation.h" +#include "browser/BrowserOperationAttribute.h" #include "browser/BrowserExtraMember.h" #include "GenerationSettings.h" #include "AttributeData.h" @@ -128,6 +129,11 @@ void QuickEdit::OnShow() Show(current); } +void QuickEdit::OnAddParameter() +{ + AddParameter(); +} + void QuickEdit::OnPerformFiltering(QString) { PerformFiltering(expandedNodes, ui->tvEditor, treeModel, rootInterface); @@ -225,6 +231,31 @@ void QuickEdit::CheckColumnVisibility() } } +void QuickEdit::AddParameter() +{ + BrowserNode * currentNode = GetCurrentNode(); + BrowserNode* operationNode; + + if(currentNode->TypeID() == TypeIdentifier()) //, TypeIdentifier()) + operationNode = currentNode; + else + operationNode = static_cast(currentNode)->get_operation(); + + OperationData* currentData = static_cast(operationNode->get_data()); + currentData->set_n_params(currentData->nparams + 1); + + + +} + +BrowserNode *QuickEdit::GetCurrentNode() +{ + QModelIndex current = ui->tvEditor->currentIndex(); + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* itemAsNode = static_cast(itemAsInterface->InternalPointer()); + return itemAsNode; +} + QList > QuickEdit::CreateCheckList() { QList > result; @@ -355,6 +386,7 @@ void QuickEdit::closeEvent(QCloseEvent *) settings.setValue("quickedit_checkboxes/php",ui->chkPhp->isChecked()); settings.setValue("quickedit_checkboxes/python", ui->chkPython->isChecked()); settings.setValue("quickedit_checkboxes/idl", ui->chkIdl->isChecked()); + ui->leSearch->setText(""); } QSharedPointer QuickEdit::CreateInterfaceNode(QSharedPointer root, diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index c6e23ea3b..43a3a3d29 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -110,6 +110,11 @@ class QuickEdit : public QWidget void SetupItemCreationFuncs(); void CheckColumnVisibility(); + void AddParameter(); + + BrowserNode* GetCurrentNode(); + + QSharedPointer CreateInterfaceNode(QSharedPointer root, QSharedPointer > controller, BrowserNode *node); void AssignItemsForOperation(QSharedPointer root,BrowserNode*); void AssignItemsForClass(QSharedPointer root,BrowserNode*); @@ -123,6 +128,7 @@ class QuickEdit : public QWidget public slots: void OnContextMenu(QPoint); void OnShow(); + void OnAddParameter(); void OnPerformFiltering(QString); void OnDecreaseOpenLevels(); void OnIncreaseOpenLevels(); diff --git a/src/CustomWidgets/quickedit.ui b/src/CustomWidgets/quickedit.ui index b186a4a04..158f891e0 100644 --- a/src/CustomWidgets/quickedit.ui +++ b/src/CustomWidgets/quickedit.ui @@ -14,10 +14,7 @@ Form - - 0 - - + @@ -140,6 +137,30 @@ + + + Attribute + + + + :/root/icons/bullet_add.png:/root/icons/bullet_add.png + + + + + + + Qt::Horizontal + + + + 825 + 20 + + + + + diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index a55202edd..fbda0efd3 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -88,6 +88,7 @@ #include "translate.h" #include "RelationData.h" #include "menufactory.h" +#include "misc/TypeIdentifier.h" // Added for porting by lgfreitas #include @@ -4027,3 +4028,8 @@ BrowserNode * BrowserClass::get_it(const char * k, int id) return r; } + +uint BrowserClass::TypeID() +{ + return TypeIdentifier::id(); +} diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index c3625a71e..387089147 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -149,6 +149,7 @@ class BrowserClass : public BrowserNode, public Labeled 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(); diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 74646488c..c4f6d35cf 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -607,6 +607,11 @@ void BrowserNode::on_close() // does nothing } +uint BrowserNode::TypeID() +{ + return TypeIdentifier::id(); +} + BrowserNode * BrowserNode::get_container(UmlCode k) const { BrowserNode * p = (BrowserNode *) this; diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index 3a2210f9d..7604e59c6 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -44,7 +44,7 @@ #include "mystr.h" #include "Editable.h" #include "AType.h" - +#include "misc/TypeIdentifier.h" class QDragMoveEvent; class Q3PopupMenu; template class Q3PtrDict; @@ -208,6 +208,7 @@ class BrowserNode : public Q3ListViewItem, 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; diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp index 9d6652c6d..806ea4933 100644 --- a/src/browser/BrowserOperationAttribute.cpp +++ b/src/browser/BrowserOperationAttribute.cpp @@ -135,3 +135,8 @@ AType BrowserOperationReturnType::get_param_type() const BrowserNodeAbstractRemove::BrowserNodeAbstractRemove(BrowserView* view) : BrowserNode(QString(), view) { } + +uint BrowserNodeAbstractRemove::TypeID() +{ + return TypeIdentifier::id(); +} diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index d90578d0d..658dc4a59 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -56,6 +56,7 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove } void modified(){operation->package_modified();} virtual const QPixmap * pixmap(int) const; + virtual uint TypeID(); }; diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 64ae48413..665114e2e 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -72,7 +72,7 @@ OperationData::OperationData(int id) 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) { } @@ -119,17 +119,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(new ParamData()); + *params[i] = *model->params[i]; + depend_on(params[i]->get_type().type); } } + + if (nexceptions == 0) exceptions = 0; else { @@ -144,8 +146,6 @@ OperationData::OperationData(OperationData * model, BrowserNode * bn) OperationData::~OperationData() { - if (params) - delete [] params; if (exceptions) delete [] exceptions; @@ -193,7 +193,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) @@ -218,16 +218,13 @@ void OperationData::PropagateFrom(const OperationData * model, bool goBack, QLis 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(new ParamData()); + *params[i] = *model->params[i]; + depend_on(params[i]->get_type().type); } } @@ -343,13 +340,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); } } @@ -576,8 +573,10 @@ void OperationData::set_browser_node(BrowserOperation * o, bool update) if (!strcmp(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(new ParamData()); + params[0]->set_name("self"); } } @@ -618,7 +617,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 = ", "; } @@ -760,7 +759,7 @@ void OperationData::set_return_type(const AType & t) const char * OperationData::get_param_name(int rank) const { - return params[rank].get_name(); + return params[rank]->get_name(); } QStringList OperationData::get_param_names() const @@ -768,7 +767,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; } @@ -778,7 +777,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; } @@ -788,44 +787,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())) @@ -834,19 +833,19 @@ 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(new ParamData()); } - - nparams = n; + nparams = params.count(); } const AType & OperationData::get_exception(int rank) const @@ -1739,7 +1738,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))); @@ -2213,7 +2212,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) @@ -2237,8 +2236,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) @@ -2276,9 +2275,13 @@ void OperationData::send_uml_def(ToolCom * com, BrowserNode * bn, ParamData * p; com->write_unsigned(nparams); - - for (p = params, n = nparams; n; p += 1, n -= 1) - p->send_uml_def(com); + n = nparams; + //for (p = params, n = nparams; n; p += 1, n -= 1) + for(auto& param : params) + { + param->send_uml_def(com); + n -= 1; + } ExceptionData * ep; @@ -2712,27 +2715,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 (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; @@ -2753,9 +2744,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; @@ -2769,7 +2760,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; } @@ -3415,7 +3406,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); @@ -3707,8 +3698,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")) { @@ -3942,16 +3933,17 @@ 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) - { - if(origin.params == nullptr) - return false; - else if(another.params == nullptr) - return false; - paramsResult = *origin.params == *another.params; - } +// if(origin.params.isEmpty() && another.params.isEmpty()) +// paramsResult = true; +// else if(origin.params != another.params) +// { +// if(origin.params.isEmpty()) +// return false; +// else if(another.params.isEmpty() == nullptr) +// return false; +// paramsResult = *origin.params == *another.params; +// } + paramsResult = origin.params == another.params; if(!paramsResult) return false; if(origin.uml_visibility != another.uml_visibility || @@ -4029,17 +4021,7 @@ bool operator==(const OperationData & origin, const OperationData & another) bool PropagationEquality(const OperationData & origin, const OperationData & another) { bool paramsResult = false; - if(!origin.params && !another.params) - paramsResult = true; - else if(origin.params != another.params) - { - if(origin.params == nullptr) - return false; - else if(another.params == nullptr) - return false; - paramsResult = *origin.params == *another.params; - } - + paramsResult = origin.params != another.params; if(!paramsResult) return false; diff --git a/src/data/OperationData.h b/src/data/OperationData.h index 90fd563e2..3316859f0 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -31,6 +31,7 @@ #include //Added by qt3to4: #include +#include #include "UmlEnum.h" @@ -106,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> params; + //ParamData * params = nullptr; // remark : do NOT use QArray ExceptionData * exceptions; WrapperStr constraint; diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 4991b64de..89670babf 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -1895,7 +1895,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); @@ -1907,7 +1907,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); @@ -1919,7 +1919,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; From a2b09c8d23b178709e638d72a6634f0c5f25ae7d Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 16 Mar 2013 18:44:27 +0400 Subject: [PATCH 058/297] 1. Got rid of static consts, replaced them with indexOf 2. Can now add Operations and Parameters in quick edit. 3. Can delete/undelete nodes in quick edit. Even operation parameters (although this needs testing) 4. itemcontroller now passes qmodelindex into getetrs/setters. turns outthere are cases where it is needed --- bin/settings.ini | 2 +- src/CustomWidgets/GenericDelegate.cpp | 26 +- src/CustomWidgets/quickedit.cpp | 140 ++++++++-- src/CustomWidgets/quickedit.h | 2 + .../quickeditcontrollersetup.cpp | 253 ++++++++++-------- src/Libs/L_UniversalModels/UML/models/201002 | 88 ++++-- .../L_UniversalModels/UML/models/42.session | 2 +- .../include/ItemController.h | 32 +-- src/Libs/L_UniversalModels/include/TreeItem.h | 28 +- .../include/TreeItemInterface.h | 2 + .../L_UniversalModels/include/TreeModel.h | 2 + src/Libs/L_UniversalModels/src/TreeModel.cpp | 12 +- src/browser/BrowserClass.cpp | 19 +- src/browser/BrowserClass.h | 1 + src/browser/BrowserNode.cpp | 15 +- src/browser/BrowserNode.h | 3 +- src/browser/BrowserOperation.cpp | 5 + src/browser/BrowserOperation.h | 1 + src/browser/BrowserOperationAttribute.cpp | 53 +++- src/browser/BrowserOperationAttribute.h | 10 +- src/browserfunctions/operationfuncs.cpp | 150 +++++++++-- src/browserfunctions/operationfuncs.h | 13 + src/data/OperationData.cpp | 17 +- src/data/OperationData.h | 3 + src/diagram/UmlWindow.cpp | 8 - src/dialog/OperationDialog.cpp | 22 +- src/douml.pro | 2 +- src/misc/GenerateTypeId.cpp | 5 + src/misc/mu.cpp | 2 +- src/ui/catalogwidget.cpp | 4 +- src/{CustomWidgets => ui}/quickedit.ui | 17 +- 31 files changed, 683 insertions(+), 256 deletions(-) rename src/{CustomWidgets => ui}/quickedit.ui (90%) diff --git a/bin/settings.ini b/bin/settings.ini index 222a707c6..1fe14441a 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,7 +10,7 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Import XMI 2.x,Generate XMI 2.x,Generate XMI 1.2,Generate .pro" [headers] -quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6}\0\0\0\x14\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x14\0\0\0Û\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x1î\0\0\0\x1\0\0\0\0)" +quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6Ü\0\0\0\x15\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x15\0\0\0Û\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x1é\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0)" [quickedit_checkboxes] cpp=true diff --git a/src/CustomWidgets/GenericDelegate.cpp b/src/CustomWidgets/GenericDelegate.cpp index 7f7c4a2a4..c4f7e8ed1 100644 --- a/src/CustomWidgets/GenericDelegate.cpp +++ b/src/CustomWidgets/GenericDelegate.cpp @@ -1,19 +1,19 @@ #include "GenericDelegate.h" #include #include -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 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) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 9b1b69295..1c11542f4 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -33,17 +33,6 @@ #include #include -static const int nameIndex = 0; -static const int typeIndex = 1; -static const int defaultIndex = 2; -static const int stereotypeIndex = 3; -static const int visibilityIndex = 4; -static const int staticIndex = 5; -static const int abstractIndex = 6; -static const int multiplicityIndex = 7; -static const int directionIndex = 8; - - static QRect CheckBoxRect(const QStyleOptionViewItem &view_item_style_options) { QStyleOptionButton check_box_style_option; QRect check_box_rect = QApplication::style()->subElementRect( @@ -134,6 +123,11 @@ void QuickEdit::OnAddParameter() AddParameter(); } +void QuickEdit::OnAddOperation() +{ + AddOperation(); +} + void QuickEdit::OnPerformFiltering(QString) { PerformFiltering(expandedNodes, ui->tvEditor, treeModel, rootInterface); @@ -233,19 +227,115 @@ void QuickEdit::CheckColumnVisibility() void QuickEdit::AddParameter() { - BrowserNode * currentNode = GetCurrentNode(); + QModelIndex current = ui->tvEditor->selectionModel()->currentIndex(); + if(!current.isValid()) + return; + + current = current.sibling(current.row(), 0); + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); + BrowserNode* operationNode; - if(currentNode->TypeID() == TypeIdentifier()) //, TypeIdentifier()) + if(currentNode->TypeID() == TypeIdentifier::id()) //, TypeIdentifier()) + { operationNode = currentNode; - else + } + else if(currentNode->TypeID() == TypeIdentifier::id()) + { operationNode = static_cast(currentNode)->get_operation(); + itemAsInterface = itemAsInterface->parent(); + current = current.parent(); + } + else + return; OperationData* currentData = static_cast(operationNode->get_data()); - currentData->set_n_params(currentData->nparams + 1); + int originalParamCount = currentData->nparams; + currentData->set_n_params(originalParamCount + 1); + QModelIndex parentIndex = current.parent(); + + parentIndex = parentIndex.sibling(parentIndex.row(), 0); + TreeItemInterface* parent = static_cast(parentIndex.internalPointer()); + if(!parent) + parent = treeModel->RootItem(); + int insertIndex = parent->GetIndexOfChild(itemAsInterface); + QSharedPointer sharedOfOperation = parent->GetChildren()[insertIndex]; + + int newItemPosition = currentData->nparams; + if(!treeModel->insertRows(newItemPosition-1, 1, current)) + return; + + QSharedPointer param(new BrowserOperationAttribute(dummyView,static_cast(operationNode),currentData->params.last())); + localNodeHolder.push_back(param); + if(!current.isValid()) + return; + QModelIndex newItem = treeModel->index(newItemPosition-1,0,current); + TreeItemInterface *newItemInterface = static_cast(newItem.internalPointer()); + TreeItem* newItemAsNode = static_cast*>(newItemInterface); + newItemAsNode->SetController(operationAttributeController); + newItemAsNode->SetParent(sharedOfOperation); + newItemAsNode->SetInternalData(param.data()); + operationNode->modified(); +} +void QuickEdit::AddOperation() +{ + QModelIndex current = ui->tvEditor->selectionModel()->currentIndex(); + if(!current.isValid()) + return; + + current = current.sibling(current.row(), 0); + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); + + BrowserClass* classNode; + + int newItemPosition = 0; + if(currentNode->TypeID() == TypeIdentifier::id()) //, TypeIdentifier()) + { + classNode = static_cast(currentNode); + newItemPosition = itemAsInterface->childCount(); + } + else if(currentNode->TypeID() == TypeIdentifier::id() && current.parent().isValid()) + { + itemAsInterface = static_cast(current.parent().internalPointer()); + classNode = static_cast(itemAsInterface->InternalPointer()); + newItemPosition = current.row()+1; + current = current.parent(); + } + else + return; + + if(!classNode) + return; + BrowserOperation* newOperation = static_cast(classNode->addOperation()); + QModelIndex parentIndex; + TreeItemInterface* parent; + if(treeModel->parent(current).isValid()) + { + parentIndex = treeModel->parent(current); + parentIndex = parentIndex.sibling(parentIndex.row(), 0); + parent = static_cast(parentIndex.internalPointer()); + } + else + parent = treeModel->RootItem(); + int insertIndex = parent->GetIndexOfChild(itemAsInterface); + QSharedPointer 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(newItem.internalPointer()); + TreeItem* newItemAsNode = static_cast*>(newItemInterface); + newItemAsNode->SetController(operationController); + newItemAsNode->SetParent(sharedOfOperation); + newItemAsNode->SetInternalData(newOperation); + //classNode->modified(); } BrowserNode *QuickEdit::GetCurrentNode() @@ -308,7 +398,7 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember, UmlClassView, UmlPackage}; //validTypes = {UmlClass, UmlOperation, UmlAttribute}; - columns << "name" << "type" << "default_value" << "stereotype" + columns << "name" << "type" << "default_value" << "stereotype" << "deleted" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" << "pass" << "const" << "volatile" << "friend" << "virtual" << "inline" @@ -326,6 +416,8 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) 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->pbAddAttribute, SIGNAL(clicked()), this, SLOT(OnAddParameter())); + connect(ui->pbAddOperation, SIGNAL(clicked()), this, SLOT(OnAddOperation())); connect(ui->chkCpp, SIGNAL(clicked()), this, SLOT(OnChangeColumnVisibility())); connect(ui->tvEditor->header(), SIGNAL(sectionResized(int,int,int)), this, SLOT(OnNewSectionSizes(int,int,int))); @@ -488,8 +580,9 @@ void QuickEdit::AssignItemsForOperation(QSharedPointer root, for(int i(0); i< paramCount; ++i) { - ParamData* data = &((OperationData*)operationNode->get_data())->params[i]; - QSharedPointer param(new BrowserOperationAttribute(dummyView,operationNode,data)); + //ParamData* data = ((OperationData*)operationNode->get_data())->params[i].get(); + QSharedPointer param(new BrowserOperationAttribute(dummyView,operationNode, + ((OperationData*)operationNode->get_data())->params[i])); operationNodes << param; items << CreateInterfaceNode(interfaceItem, operationAttributeController, param.data()); } @@ -527,8 +620,8 @@ void QuickEdit::CheckBoxDelegateSetup() checkboxDelegate->widgetCreator = [](QWidget * ) {return static_cast(0);}; checkboxDelegate->paintProcessor = paintCheckbox; checkboxDelegate->editorEventProcessor = editorEvent; - ui->tvEditor->setItemDelegateForColumn(staticIndex, checkboxDelegate); - ui->tvEditor->setItemDelegateForColumn(abstractIndex, checkboxDelegate); + 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); @@ -538,6 +631,7 @@ void QuickEdit::CheckBoxDelegateSetup() 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); } @@ -566,7 +660,7 @@ void QuickEdit::VisibilityDelegateSetup() QString value = box->currentText(); model->setData(index, value, Qt::EditRole); }; - ui->tvEditor->setItemDelegateForColumn(visibilityIndex, visibilityDelegate); + ui->tvEditor->setItemDelegateForColumn(columns.indexOf("visibility"), visibilityDelegate); } @@ -606,7 +700,7 @@ void QuickEdit::TypeDelegateSetup() QString value = box->currentText(); model->setData(index, value, Qt::EditRole); }; - ui->tvEditor->setItemDelegateForColumn(typeIndex, delegate); + ui->tvEditor->setItemDelegateForColumn(columns.indexOf("type"), delegate); } @@ -635,5 +729,5 @@ void QuickEdit::DirectionDelegateSetup() QString value = box->currentText(); model->setData(index, value, Qt::EditRole); }; - ui->tvEditor->setItemDelegateForColumn(directionIndex, delegate); + ui->tvEditor->setItemDelegateForColumn(columns.indexOf("direction"), delegate); } diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 43a3a3d29..57ee1294c 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -111,6 +111,7 @@ class QuickEdit : public QWidget void CheckColumnVisibility(); void AddParameter(); + void AddOperation(); BrowserNode* GetCurrentNode(); @@ -129,6 +130,7 @@ class QuickEdit : public QWidget void OnContextMenu(QPoint); void OnShow(); void OnAddParameter(); + void OnAddOperation(); void OnPerformFiltering(QString); void OnDecreaseOpenLevels(); void OnIncreaseOpenLevels(); diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 00f13e384..f5159efdd 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -11,6 +11,7 @@ #include "browser/BrowserOperationAttribute.h" #include "browser/BrowserNodeDummy.h" #include "browser/BrowserAttribute.h" +#include "ProfiledStereotypes.h" #include "browser/BrowserRelation.h" #include "browser/BrowserExtraMember.h" #include "AttributeData.h" @@ -29,20 +30,12 @@ #include #include -static const int nameIndex = 0; -static const int typeIndex = 1; -static const int defaultIndex = 2; -static const int stereotypeIndex = 3; -static const int visibilityIndex = 4; -static const int staticIndex = 5; -static const int abstractIndex = 6; -static const int multiplicityIndex = 7; -static const int directionIndex = 8; #define ADD_GETSET(TYPE,HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ HOLDER->AddGetter(ROW,ROLES, \ - [] (const BrowserNode* data) \ + [] (const BrowserNode* data, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return QVariant(); \ const TYPE* pointer = static_cast(data);\ @@ -53,8 +46,9 @@ static const int directionIndex = 8; } \ ); \ HOLDER->AddSetter(ROW,ROLES, \ - [] (BrowserNode* data, QVariant value) \ + [] (BrowserNode* data, QVariant value, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return false; \ TYPE* pointer = static_cast(data);\ @@ -67,8 +61,9 @@ static const int directionIndex = 8; #define ADD_PIXMAP_GETTER(TYPE,HOLDER,ROW,ROLES,ACCESSOR) \ HOLDER->AddGetter(ROW,ROLES, \ - [] (const BrowserNode* data) \ + [] (const BrowserNode* data, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return QVariant(); \ const TYPE* pointer = static_cast(data);\ @@ -81,8 +76,9 @@ static const int directionIndex = 8; #define ADD_GETSET_CONVERTED(TYPE,HOLDER,ROW,ROLES,VARIANTCONVERTER, VALUECONVERTER, ACCESSOR,SETTER) \ HOLDER->AddGetter(ROW,ROLES, \ - [] (const BrowserNode* data) \ + [] (const BrowserNode* data, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return QVariant(); \ const TYPE* pointer = static_cast(data);\ @@ -93,8 +89,9 @@ static const int directionIndex = 8; } \ ); \ HOLDER->AddSetter(ROW,ROLES, \ - [] (BrowserNode* data, QVariant value) \ + [] (BrowserNode* data, QVariant value, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return false; \ TYPE* pointer = static_cast(data);\ @@ -107,8 +104,9 @@ static const int directionIndex = 8; #define ADD_GETSET_DIRECT(TYPE,HOLDER,ROW,ROLES,CONVERTER,PARAM) \ HOLDER->AddGetter(ROW,ROLES, \ - [] (const BrowserNode* data) \ + [] (const BrowserNode* data, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return QVariant(); \ const TYPE* pointer = static_cast(data);\ @@ -119,8 +117,9 @@ static const int directionIndex = 8; } \ ); \ HOLDER->AddSetter(ROW,ROLES, \ - [] (BrowserNode* data, QVariant value) \ + [] (BrowserNode* data, QVariant value, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return false; \ TYPE* pointer = static_cast(data);\ @@ -133,8 +132,9 @@ static const int directionIndex = 8; #define ADD_GETSET_DIRECT_ASSIGNMENT(TYPE,HOLDER,ROW,ROLES,PARAM, ASSIGNSTRING) \ HOLDER->AddGetter(ROW,ROLES, \ - [] (const BrowserNode* data) \ + [] (const BrowserNode* data, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return QVariant(); \ const TYPE* pointer = static_cast(data);\ @@ -145,8 +145,9 @@ static const int directionIndex = 8; } \ ); \ HOLDER->AddSetter(ROW,ROLES, \ - [] (BrowserNode* data, QVariant value) \ + [] (BrowserNode* data, QVariant value, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return false; \ TYPE* pointer = static_cast(data);\ @@ -188,8 +189,9 @@ template std::array in(T0 arg0, T...arg #define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ HOLDER->AddGetter(ROW,ROLES, \ - [] (const BrowserNode* data) \ + [] (const BrowserNode* data, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return QVariant(); \ const TYPE* pointer = static_cast(data);\ @@ -200,8 +202,9 @@ template std::array in(T0 arg0, T...arg } \ ); \ HOLDER->AddSetter(ROW,ROLES, \ - [] (BrowserNode* data, QVariant value) \ + [] (BrowserNode* data, QVariant value, const QModelIndex& index) \ { \ + Q_UNUSED(index) \ if(!data)\ return false; \ TYPE* pointer = static_cast(data);\ @@ -216,50 +219,30 @@ void QuickEdit::SetupClassController() { classController = QSharedPointer >( new ItemController()); classController->SetColumns(columns); - ADD_GETSET(BrowserClass, classController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserClass, classController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserClass, classController, columns.indexOf("stereotype"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_stereotype, def->set_stereotype); -// ADD_GETSET(BrowserClass, classController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), -// toString, get_stereotype, def->set_stereotype); -// ADD_GETSET(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), -// toInt, def->get_uml_visibility, def->set_uml_visibility); + ADD_GETSET(BrowserClass, classController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, deletedp, set_deleted); - ADD_GETSET_CONVERTED(BrowserClass, classController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_CONVERTED(BrowserClass, classController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_uml_visibility); - ADD_GETSET(BrowserClass, classController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserClass, classController, columns.indexOf("abstract"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool, def->get_is_abstract, def->set_is_abstract); - ADD_PIXMAP_GETTER(BrowserClass, classController, nameIndex,std::initializer_list({Qt::DecorationRole}), pixmap); -// classController->AddGetter(nameIndex,std::initializer_list({Qt::DecorationRole}), -// [] (const BrowserNode* data) -//{ -// if(!data) -// return QVariant(); -// const BrowserClass* pointer = static_cast(data); -// if(pointer) -// { -// const QPixmap* px = pointer->pixmap(0); -//// QPixmap pxConst = QIcon(":/root/icons/mouse_control.png").pixmap(); -//// const QPixmap* px = &pxConst; -// return QVariant(QIcon(*px)); -// } -// else -// return QVariant(); -// } -// ); - + ADD_PIXMAP_GETTER(BrowserClass, classController, columns.indexOf("name"),std::initializer_list({Qt::DecorationRole}), pixmap); classController->AddFlagsFunctor ( - [](const QModelIndex& index) + [&](const QModelIndex& index) { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,stereotypeIndex,visibilityIndex,abstractIndex))) + 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(index.internalPointer()); @@ -280,24 +263,22 @@ void QuickEdit::SetupOperationController() { operationController = QSharedPointer >( new ItemController()); operationController->SetColumns(columns); - ADD_GETSET(BrowserOperation, operationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperation, operationController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET(BrowserOperationReturnType, operationController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationReturnType, operationController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_param_type().get_type, set_param_type); -// ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), -// toInt, get_cpp_visibility, set_cpp_visibility); -// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserOperation, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), -// visibility_as_string(), BrowserNode::encode_visibility(value.toString())); - ADD_GETSET_CONVERTED(BrowserOperation, operationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_CONVERTED(BrowserOperation, operationController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_uml_visibility); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperation, operationController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, deletedp, set_deleted); + + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("static"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_isa_class_operation, set_isa_class_operation); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, abstractIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("abstract"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_is_abstract, set_is_abstract); - //data->get_cpp_name_spec(); ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("const"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_const, set_cpp_const); ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("volatile"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), @@ -308,7 +289,6 @@ void QuickEdit::SetupOperationController() toBool,get_cpp_virtual, set_cpp_virtual); ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("inline"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_inline, set_cpp_inline); - //"default" << "delete" << "override" << "final" << "noexcept"; ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_default, set_cpp_default); @@ -318,12 +298,19 @@ void QuickEdit::SetupOperationController() toBool,get_cpp_override, set_cpp_override); ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("final"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_final, set_cpp_final); -// ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("noexcept"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), -// toBool,get_cpp_const, set_cpp_const); - + std::function f = [](BrowserNode* node ,const QModelIndex& index) + { + Q_UNUSED(index); + BrowserOperation* oper = static_cast(node); + oper->modified(); + oper->setText(0,oper->get_name() ); + oper->package_modified(); + oper->get_data()->modified(); + }; + operationController->AddPostProcessors(columns.indexOf("name"), QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); - ADD_PIXMAP_GETTER(BrowserOperation, operationController, nameIndex,std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserOperation, operationController, columns.indexOf("name"),std::initializer_list({Qt::DecorationRole}), pixmap); operationController->AddFlagsFunctor @@ -332,9 +319,9 @@ void QuickEdit::SetupOperationController() { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,staticIndex,visibilityIndex,abstractIndex, + 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("default"),columns.indexOf("delete"),columns.indexOf("override"),columns.indexOf("final")))) + ,columns.indexOf("default"),columns.indexOf("delete"),columns.indexOf("override"),columns.indexOf("final"), columns.indexOf("deleted")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -355,38 +342,42 @@ void QuickEdit::SetupAttributeController() { attributeController = QSharedPointer >( new ItemController()); attributeController->SetColumns(columns); - ADD_GETSET(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_type().get_type, set_type); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_init_value, set_init_value); - ADD_GETSET(BrowserAttribute, attributeController, stereotypeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("stereotype"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_stereotype, def->set_stereotype); -// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, deletedp, set_deleted); + +// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserAttribute, attributeController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), // visibility_as_string(), BrowserNode::encode_visibility(value.toString())); - ADD_GETSET_CONVERTED(BrowserAttribute, attributeController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_CONVERTED(BrowserAttribute, attributeController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_visibility); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("static"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_isa_class_attribute, set_isa_class_attribute); - ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); attributeController->AddFlagsFunctor ( - [](const QModelIndex& index) + [&](const QModelIndex& index) { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,stereotypeIndex, visibilityIndex, staticIndex))) + if(!(index.column() *in(columns.indexOf("name"),columns.indexOf("type"),columns.indexOf("default"),columns.indexOf("stereotype"), + columns.indexOf("visibility"), columns.indexOf("static"), columns.indexOf("deleted")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -407,35 +398,68 @@ void QuickEdit::SetupOperationAttributeController() { operationAttributeController = QSharedPointer >( new ItemController()); operationAttributeController->SetColumns(columns); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, typeIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, directionIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("direction"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_direction, set_direction); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, deletedp, set_deleted); + + operationAttributeController->AddGetter(columns.indexOf("deleted"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data, const QModelIndex& index) +{ + Q_UNUSED(index); + if(!data) + return QVariant(); + const BrowserOperationAttribute* pointer = static_cast(data); + if(pointer) + return QVariant(pointer->deletedp()); + else + return QVariant(); + } + ); + operationAttributeController->AddSetter(columns.indexOf("deleted"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (BrowserNode* data, QVariant value, const QModelIndex& index) + { + if(!data) + return false; + BrowserOperationAttribute* pointer = static_cast(data); + if(pointer) + { + pointer->set_deleted(value.toBool(), index.row()); + pointer->modified(); + } + return true; + } + ); + + + + + std::function f = [](BrowserNode* node, const QModelIndex& index) { BrowserOperationAttribute* oper = static_cast(node); recompute_param(oper->get_operation(),index.row(),true); }; - operationAttributeController->AddPostProcessors(directionIndex, QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); + operationAttributeController->AddPostProcessors(columns.indexOf("direction"), QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); - //ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); - - ADD_PIXMAP_GETTER(BrowserOperationAttribute, operationAttributeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserOperationAttribute, operationAttributeController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); operationAttributeController->AddFlagsFunctor ( - [](const QModelIndex& index) + [&](const QModelIndex& index) { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,directionIndex))) + if(!(index.column() *in(columns.indexOf("name"),columns.indexOf("type"),columns.indexOf("default"),columns.indexOf("direction"), columns.indexOf("deleted")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -459,22 +483,24 @@ void QuickEdit::SetupRelationController() relationController = QSharedPointer >( new ItemController()); relationController->SetColumns(columns); - ADD_GETSET(BrowserRelation, relationController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserRelation, relationController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET_DIRECT(BrowserRelation, relationController, defaultIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, def->a.init_value.operator QString()); -// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), -// visibility_as_string(), BrowserNode::encode_visibility(value.toString())); + + ADD_GETSET(BrowserRelation, relationController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, deletedp, set_deleted); + std::function f = [](RoleData& data, UmlVisibility vis){data.uml_visibility = vis;}; -// ADD_GETSET_CONVERTED(BrowserRelation, relationController, visibilityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), -// toString,BrowserNode::encode_visibility,visibility_as_string, [](RoleData& data, UmlVisibility vis){data.uml_visibility = vis;}(pointer->def->a)); - ADD_PIXMAP_GETTER(BrowserRelation, relationController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + + ADD_PIXMAP_GETTER(BrowserRelation, relationController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); - relationController->AddGetter(visibilityIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - [] (const BrowserNode* data) + relationController->AddGetter(columns.indexOf("visibility"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data, const QModelIndex& index) { - if(!data) + Q_UNUSED(index); + if(!data) return QVariant(); const BrowserRelation* pointer = static_cast(data); if(pointer) @@ -483,10 +509,11 @@ void QuickEdit::SetupRelationController() return QVariant(); } ); - relationController->AddSetter(visibilityIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - [] (BrowserNode* data, QVariant value) + relationController->AddSetter(columns.indexOf("visibility"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (BrowserNode* data, QVariant value, const QModelIndex& index) { - if(!data) + Q_UNUSED(index); + if(!data) return false; BrowserRelation* pointer = static_cast(data); if(pointer) @@ -497,14 +524,15 @@ void QuickEdit::SetupRelationController() ); - ADD_GETSET_DIRECT(BrowserRelation, relationController, staticIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("static"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool, def->a.isa_class_relation); - ADD_GETSET_DIRECT(BrowserRelation, relationController, multiplicityIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("multiplicity"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, def->a.multiplicity.operator QString()); - relationController->AddGetter(typeIndex,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - [] (const BrowserNode* data) + relationController->AddGetter(columns.indexOf("type"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data, const QModelIndex& ) { + if(!data) return QVariant(); const BrowserRelation* pointer = static_cast(data); @@ -515,7 +543,7 @@ void QuickEdit::SetupRelationController() } ); relationController->AddSetter(1,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - [] (BrowserNode* data, QVariant value) + [] (BrowserNode* data, QVariant value, const QModelIndex& ) { if(!data) return false; @@ -529,11 +557,11 @@ void QuickEdit::SetupRelationController() relationController->AddFlagsFunctor ( - [](const QModelIndex& index) + [&](const QModelIndex& index) { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex,typeIndex,defaultIndex,visibilityIndex))) + 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(index.internalPointer()); @@ -542,7 +570,7 @@ void QuickEdit::SetupRelationController() BrowserNode* pointer = static_cast(iface->InternalPointer()); if(!pointer) return result; - if(pointer->is_writable() && (index.column() *in(nameIndex,defaultIndex,visibilityIndex))) + if(pointer->is_writable() && (index.column() *in(columns.indexOf("name"),columns.indexOf("default"),columns.indexOf("visibility")))) result |= Qt::ItemIsEditable; result |= Qt::ItemIsEnabled ; return result; @@ -555,18 +583,21 @@ void QuickEdit::SetupExtraNodeController() extraNodeController = QSharedPointer >( new ItemController()); extraNodeController->SetColumns(columns); - ADD_GETSET(BrowserExtraMember, extraNodeController, nameIndex, std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserExtraMember, extraNodeController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_PIXMAP_GETTER(BrowserExtraMember, extraNodeController, nameIndex, std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_GETSET(BrowserExtraMember, extraNodeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, deletedp, set_deleted); + + ADD_PIXMAP_GETTER(BrowserExtraMember, extraNodeController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); extraNodeController->AddFlagsFunctor ( - [](const QModelIndex& index) + [&](const QModelIndex& index) { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(nameIndex))) + if(!(index.column() *in(columns.indexOf("name"), columns.indexOf("deleted")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); diff --git a/src/Libs/L_UniversalModels/UML/models/201002 b/src/Libs/L_UniversalModels/UML/models/201002 index 6e423f339..b41909260 100644 --- a/src/Libs/L_UniversalModels/UML/models/201002 +++ b/src/Libs/L_UniversalModels/UML/models/201002 @@ -1,6 +1,6 @@ format 75 "TreeController" // TreeController - revision 34 + revision 38 modified_by 42 "zeks" // class settings //class diagram settings @@ -233,11 +233,11 @@ ${inlines} preserve_cpp_body_indent cpp_virtual public explicit_return_type "variant" nparams 2 - param in name "column" explicit_type "int" + param in name "index" explicit_type "modelIndex" param in name "role" explicit_type "int" - cpp_decl " ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract}; + 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}${(}${t0} ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl} + cpp_def "${description}${inline}${type} @{externalClass}${class}::${name}${(}const ${t0} & ${p0}, ${t1} ${p1}${)}${const}${volatile}${staticnl} { ${body}} " @@ -300,12 +300,12 @@ ${inlines} preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool" nparams 3 - param in name "column" explicit_type "int" + 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}${(}${t0} ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract}; + 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}${(}${t0} ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${staticnl} + cpp_def "${description}${inline}${type} ${class}::${name}${(}const ${t0} & ${p0}, const ${t1} & ${p1}, ${t2} ${p2}${)}${const}${staticnl} { ${body}} " @@ -515,6 +515,22 @@ ${inlines} 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 @@ -646,6 +662,22 @@ ${inlines} preserve_php_body_indent preserve_python_body_indent + end + + operation 2310570 "GetParent" + cpp_virtual public explicit_return_type "QSharedPointer" + 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" @@ -824,7 +856,7 @@ ${inlines} nparams 2 param in name "index" explicit_type "QPair" - param inout name "function" explicit_type "std::function" + param inout name "function" explicit_type "std::function" 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} @@ -845,7 +877,7 @@ ${inlines} param in name "row" explicit_type "int" param in name "roles" explicit_type "QVector" - param inout name "function" explicit_type "std::function" + param inout name "function" explicit_type "std::function" 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} @@ -865,7 +897,7 @@ ${inlines} nparams 2 param in name "index" explicit_type "QPair" - param inout name "function" explicit_type "std::function" + param inout name "function" explicit_type "std::function" 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} @@ -886,7 +918,7 @@ ${inlines} param in name "row" explicit_type "int" param in name "roles" explicit_type "QVector" - param inout name "function" explicit_type "std::function" + param inout name "function" explicit_type "std::function" 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} @@ -907,7 +939,7 @@ ${inlines} param in name "column" explicit_type "int" param in name "role" explicit_type "int" - param inout name "_postProcessor" explicit_type "std::function" + param inout name "_postProcessor" explicit_type "std::function" 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} @@ -926,7 +958,7 @@ ${inlines} param in name "column" explicit_type "int" param in name "roles" explicit_type "QVector" - param inout name "_postProcessor" explicit_type "std::function" + param inout name "_postProcessor" explicit_type "std::function" 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} @@ -1060,7 +1092,7 @@ ${inlines} end attribute 1257642 "getters" - private explicit_type "QHash, std::function >" + private explicit_type "QHash, std::function >" cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" java_decl "" php_decl "" @@ -1069,7 +1101,7 @@ ${inlines} end attribute 1257770 "setters" - private explicit_type "QHash, std::function >" + private explicit_type "QHash, std::function >" cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" java_decl "" php_decl "" @@ -1090,7 +1122,7 @@ ${inlines} end attribute 1326890 "postProcessors" - private explicit_type "QHash , std::function >" + private explicit_type "QHash , std::function >" cpp_decl " ${description}${static}${mutable}${volatile}${const}${type} ${name}${value};" java_decl "" php_decl "" @@ -1188,9 +1220,9 @@ ${inlines} abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "variant" nparams 2 - param in name "column" explicit_type "int" + param in name "index" explicit_type "modelIndex" param in name "role" explicit_type "int" - cpp_decl " ${description}${friend}${static}${inline}${virtual}${type} ${name}${(}${t0} ${p0}${v0}, ${t1} ${p1}${v1}${)}${const}${volatile}${abstract}; + 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 @@ -1239,10 +1271,10 @@ ${inlines} abstract preserve_cpp_body_indent cpp_virtual public explicit_return_type "bool" nparams 3 - param in name "column" explicit_type "int" + 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}${(}${t0} ${p0}${v0}, const ${t1} & ${p1}${v1}, ${t2} ${p2}${v2}${)}${const}${volatile}${abstract}; + 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 @@ -1430,6 +1462,22 @@ ${inlines} preserve_php_body_indent preserve_python_body_indent + end + + operation 2310442 "GetParent" + abstract cpp_virtual public explicit_return_type "QSharedPointer" + 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 diff --git a/src/Libs/L_UniversalModels/UML/models/42.session b/src/Libs/L_UniversalModels/UML/models/42.session index c96294d94..5f4acdeae 100644 --- a/src/Libs/L_UniversalModels/UML/models/42.session +++ b/src/Libs/L_UniversalModels/UML/models/42.session @@ -4,7 +4,7 @@ diagrams 1047 806 100 3 0 0 end show_stereotypes -selected operation_ref 2303914 // AddPostProcessor +selected class_ref 714666 // ItemController open class_ref 714666 // ItemController class_ref 741802 // TreeModel diff --git a/src/Libs/L_UniversalModels/include/ItemController.h b/src/Libs/L_UniversalModels/include/ItemController.h index ef025227b..0bbd6f6c2 100644 --- a/src/Libs/L_UniversalModels/include/ItemController.h +++ b/src/Libs/L_UniversalModels/include/ItemController.h @@ -47,17 +47,17 @@ class ItemController bool SetValue(T * item, const QModelIndex & index, const QVariant & value, int role); - void AddGetter(const QPair & index, std::function function); + void AddGetter(const QPair & index, std::function function); - void AddGetter(int row, const QVector & roles, std::function function); + void AddGetter(int row, const QVector & roles, std::function function); - void AddSetter(const QPair & index, std::function function); + void AddSetter(const QPair & index, std::function function); - void AddSetter(int row, const QVector & roles, std::function function); + void AddSetter(int row, const QVector & roles, std::function function); - void AddPostProcessor(int column, int role, std::function _postProcessor); + void AddPostProcessor(int column, int role, std::function & _postProcessor); - void AddPostProcessors(int column, QVector roles, std::function _postProcessor); + void AddPostProcessors(int column, const QVector & roles, std::function & _postProcessor); Qt::ItemFlags flags(const QModelIndex & index) const; @@ -72,8 +72,8 @@ class ItemController private: QStringList columns; - QHash, std::function > getters; - QHash, std::function > setters; + QHash, std::function > getters; + QHash, std::function > setters; QVector > flagsFunctors; QHash , std::function > postProcessors; }; @@ -96,7 +96,7 @@ QVariant ItemController::GetValue(const T * item, const QModelIndex & index, //return QVariant(); if(!getters.contains(QPair(index.column(), role))) return QVariant(); - QVariant ret = getters[QPair(index.column(), role)](item); + QVariant ret = getters[QPair(index.column(), role)](item, index); return ret; // Bouml preserved body end 00203B2A } @@ -107,7 +107,7 @@ bool ItemController::SetValue(T * item, const QModelIndex & index, const QVar // Bouml preserved body begin 00203BAA if(!setters.contains(QPair(index.column(), role))) return false; - bool result = setters[QPair(index.column(), role)](item, value); + bool result = setters[QPair(index.column(), role)](item, value, index); if(postProcessors.contains(QPair(index.column(), role)) && postProcessors[QPair(index.column(), role)] != 0) postProcessors[QPair(index.column(), role)](item, index); return result; @@ -115,7 +115,7 @@ bool ItemController::SetValue(T * item, const QModelIndex & index, const QVar } template -void ItemController::AddGetter(const QPair & index, std::function function) +void ItemController::AddGetter(const QPair & index, std::function function) { // Bouml preserved body begin 002117AA getters.insert(index, function); @@ -123,7 +123,7 @@ void ItemController::AddGetter(const QPair & index, std::function -void ItemController::AddGetter(int row, const QVector & roles, std::function function) +void ItemController::AddGetter(int row, const QVector & roles, std::function function) { // Bouml preserved body begin 00230DAA for(int role : roles) @@ -134,7 +134,7 @@ void ItemController::AddGetter(int row, const QVector & roles, std::func } template -void ItemController::AddSetter(const QPair & index, std::function function) +void ItemController::AddSetter(const QPair & index, std::function function) { // Bouml preserved body begin 0021182A setters.insert(index, function); @@ -142,7 +142,7 @@ void ItemController::AddSetter(const QPair & index, std::function -void ItemController::AddSetter(int row, const QVector & roles, std::function function) +void ItemController::AddSetter(int row, const QVector & roles, std::function function) { // Bouml preserved body begin 00230D2A for(int role : roles) @@ -153,7 +153,7 @@ void ItemController::AddSetter(int row, const QVector & roles, std::func } template -void ItemController::AddPostProcessor(int column, int role, std::function _postProcessor) +void ItemController::AddPostProcessor(int column, int role, std::function & _postProcessor) { // Bouml preserved body begin 002327AA postProcessors.insert(QPair(column,role), _postProcessor); @@ -161,7 +161,7 @@ void ItemController::AddPostProcessor(int column, int role, std::function -void ItemController::AddPostProcessors(int column, QVector roles, std::function _postProcessor) +void ItemController::AddPostProcessors(int column, const QVector & roles, std::function & _postProcessor) { // Bouml preserved body begin 0023272A for(int role : roles) diff --git a/src/Libs/L_UniversalModels/include/TreeItem.h b/src/Libs/L_UniversalModels/include/TreeItem.h index d0efd0f05..e8f2ea259 100644 --- a/src/Libs/L_UniversalModels/include/TreeItem.h +++ b/src/Libs/L_UniversalModels/include/TreeItem.h @@ -65,7 +65,7 @@ typedef TreeItem value_type; void* InternalPointer(); - void* InternalPointer() const; + virtual void* InternalPointer() const; virtual TreeItemInterface* child(int row); @@ -81,6 +81,8 @@ typedef TreeItem value_type; virtual void AddChildren(QList > children, int insertAfter = 0); + virtual QSharedPointer GetParent(); + private: T* m_data = nullptr; @@ -221,6 +223,7 @@ bool TreeItem::insertChildren(int position, int count) for (int row = 0; row < count; ++row) { QSharedPointer item (new TreeItem(0)); + item->SetParent(this->parent()->GetChildren()[this->parent()->GetIndexOfChild(this)]); m_children.insert(position, item); } @@ -299,16 +302,19 @@ void* TreeItem::InternalPointer() template void* TreeItem::InternalPointer() const { - // Bouml preserved body begin 0023282A - return m_data; - // Bouml preserved body end 0023282A + // Bouml preserved body begin 00235B2A + return m_data; + // Bouml preserved body end 00235B2A } template TreeItemInterface* TreeItem::child(int row) { // Bouml preserved body begin 0020CD2A - return m_children.at(row).data(); + TreeItemInterface* returnChildren = nullptr; + if(m_children.size() > row) + returnChildren = m_children[row].data(); + return returnChildren; // Bouml preserved body end 0020CD2A } @@ -355,7 +361,9 @@ template Qt::ItemFlags TreeItem::flags(const QModelIndex & index) const { // Bouml preserved body begin 0021B2AA - return controller->flags(index); + if(index.isValid()) + return controller->flags(index); + return Qt::ItemFlags(); // Bouml preserved body end 0021B2AA } @@ -374,5 +382,13 @@ void TreeItem::AddChildren(QList > children // Bouml preserved body end 002201AA } +template +QSharedPointer TreeItem::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 index 95826813b..132aca545 100644 --- a/src/Libs/L_UniversalModels/include/TreeItemInterface.h +++ b/src/Libs/L_UniversalModels/include/TreeItemInterface.h @@ -65,6 +65,8 @@ class L_TREE_CONTROLLER_EXPORT TreeItemInterface virtual int GetIndexOfChild(TreeItemInterface * child) = 0; + virtual QSharedPointer GetParent() = 0; + }; diff --git a/src/Libs/L_UniversalModels/include/TreeModel.h b/src/Libs/L_UniversalModels/include/TreeModel.h index 814c0ba2c..74b0684d5 100644 --- a/src/Libs/L_UniversalModels/include/TreeModel.h +++ b/src/Libs/L_UniversalModels/include/TreeModel.h @@ -60,6 +60,8 @@ class L_TREE_CONTROLLER_EXPORT TreeModel : public QAbstractItemModel TreeItemInterface * RootItem(); + void UpdateData(QModelIndex); + void InsertRootItem(QSharedPointer); TreeItemInterface * getItem(const QModelIndex & index) const; diff --git a/src/Libs/L_UniversalModels/src/TreeModel.cpp b/src/Libs/L_UniversalModels/src/TreeModel.cpp index f10fd41c9..2b8f86cb4 100644 --- a/src/Libs/L_UniversalModels/src/TreeModel.cpp +++ b/src/Libs/L_UniversalModels/src/TreeModel.cpp @@ -209,6 +209,14 @@ TreeItemInterface * TreeModel::RootItem() // Bouml preserved body end 0014CB2A } +void TreeModel::UpdateData(QModelIndex index) +{ + TreeItemInterface* item = static_cast(index.internalPointer()); + QModelIndex lastChild = index.child(item->childCount()-1, item->columnCount()-1); + emit dataChanged(index.sibling(index.row(),0), + lastChild); +} + void TreeModel::InsertRootItem(QSharedPointer item) { reset(); @@ -248,13 +256,13 @@ bool TreeModel::insertRows(int position, int rows, const QModelIndex & parent) // Bouml preserved body begin 0014CCAA //TRACE_FUNCTION; TreeItemInterface *parentItem = getItem(parent); - bool success; + 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)); + emit dataChanged(this->index(position, 0, parent), this->index(position + rows - 1, columnCount(), parent)); return success; // Bouml preserved body end 0014CCAA } diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index fbda0efd3..19776d1b6 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1378,7 +1378,8 @@ BrowserNode * BrowserClass::add_operation(BrowserOperation * oper) QString name; if (enter_child_name(name, TR("enter operation's name : "), - UmlOperation, FALSE, FALSE)) { + UmlOperation, FALSE, FALSE)) + { oper = (oper == 0) ? BrowserOperation::new_one(name, this) : (BrowserOperation *) oper->duplicate(this); @@ -1394,6 +1395,22 @@ BrowserNode * BrowserClass::add_operation(BrowserOperation * oper) return 0; } +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); diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index 387089147..09af6857e 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -80,6 +80,7 @@ class BrowserClass : public BrowserNode, public Labeled BrowserNode * add_attribute(BrowserAttribute * attr = 0, bool enum_item = FALSE); BrowserNode * add_relation(BrowserRelation * rel); BrowserNode * add_operation(BrowserOperation * oper = 0); + BrowserNode * addOperation(BrowserOperation * oper = nullptr); BrowserNode * add_inherited_operation(BrowserOperation * model); BrowserNode * add_extra_member(BrowserExtraMember * em = 0); Q3PtrList inherited_operations(unsigned limit, QString parent_name = QString()) const; diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index c4f6d35cf..194c0d641 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -199,6 +199,15 @@ 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()) @@ -316,17 +325,17 @@ 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()) diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index 7604e59c6..34cb304ac 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -160,10 +160,11 @@ class BrowserNode : public Q3ListViewItem, virtual bool is_writable() const; // 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, diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp index 4072cd3c2..3b9570c70 100644 --- a/src/browser/BrowserOperation.cpp +++ b/src/browser/BrowserOperation.cpp @@ -882,6 +882,11 @@ UmlCode BrowserOperation::get_type() const return UmlOperation; } +uint BrowserOperation::TypeID() +{ + return TypeIdentifier::id(); +} + QString BrowserOperation::get_stype() const { return TR("operation"); diff --git a/src/browser/BrowserOperation.h b/src/browser/BrowserOperation.h index 085f6e55a..712f89567 100644 --- a/src/browser/BrowserOperation.h +++ b/src/browser/BrowserOperation.h @@ -99,6 +99,7 @@ class BrowserOperation : public BrowserNode, public Labeled virtual void apply_shortcut(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; diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp index 806ea4933..c13697435 100644 --- a/src/browser/BrowserOperationAttribute.cpp +++ b/src/browser/BrowserOperationAttribute.cpp @@ -1,4 +1,5 @@ #include "browser/BrowserOperationAttribute.h" +#include "browserfunctions/operationfuncs.h" #include "BrowserView.h" #include "BrowserClass.h" #include "OperationData.h" @@ -20,31 +21,31 @@ static void FIllDirList() } } -BrowserOperationAttribute::BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, ParamData* _data): BrowserNodeAbstractRemove(view), operation(_operation), data(_data) +BrowserOperationAttribute::BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, std::shared_ptr _data): BrowserNodeAbstractRemove(view), operation(_operation), param(_data) { } void BrowserOperationAttribute::set_name(QString value) { - data->set_name(value); + param->set_name(value); } QString BrowserOperationAttribute::get_name() const { - return data->get_name(); + return param->get_name(); } void BrowserOperationAttribute::set_direction(QString value) { FIllDirList(); UmlParamDirection dir = static_cast(DirList.indexOf(value)); - data->set_dir(dir); + param->set_dir(dir); } QString BrowserOperationAttribute::get_direction() const { - return stringify(data->get_dir()); + return stringify(param->get_dir()); } void BrowserOperationAttribute::set_param_type(QString value) @@ -68,22 +69,22 @@ void BrowserOperationAttribute::set_param_type(QString value) else t.explicit_type = value; } - data->set_type(t); + param->set_type(t); } AType BrowserOperationAttribute::get_param_type() const { - return data->get_type(); + return param->get_type(); } void BrowserOperationAttribute::set_default_value(QString value) { - data->set_default_value(value); + param->set_default_value(value); } QString BrowserOperationAttribute::get_default_value() const { - return data->get_default_value(); + return param->get_default_value(); } void BrowserOperationAttribute::set_passage_type(QString) @@ -97,7 +98,9 @@ QString BrowserOperationAttribute::get_passage_type() const const QPixmap *BrowserOperationAttribute::pixmap(int) const { - return PublicAttributeIcon; + if(!isDeleted) + return PublicAttributeIcon; + return DeletedAttributeIcon; } @@ -136,7 +139,33 @@ BrowserNodeAbstractRemove::BrowserNodeAbstractRemove(BrowserView* view) : Browse { } -uint BrowserNodeAbstractRemove::TypeID() +uint BrowserOperationAttribute::TypeID() { - return TypeIdentifier::id(); + return TypeIdentifier::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); + delete_param(position, data); + isDeleted = true; + } + else + { + data->insert_param(position, param); + recompute_param(operation, position, true); + + //renumber(form, rank, 1); + + isDeleted = false; + } + } diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index 658dc4a59..3ff43ed0d 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -29,10 +29,12 @@ class BrowserNodeAbstractRemove : public BrowserNode class BrowserOperationAttribute: public BrowserNodeAbstractRemove { BrowserOperation* operation = nullptr; - ParamData* data = nullptr; + std::shared_ptr param; + + public: - BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, ParamData* _data); + BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, std::shared_ptr _data); BrowserOperation* get_operation(){return operation;} void set_name(QString); QString get_name() const; @@ -57,6 +59,10 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove void modified(){operation->package_modified();} virtual const QPixmap * pixmap(int) const; virtual uint TypeID(); + bool deletedp() const; + void set_deleted(bool, int position = 0); + + bool isDeleted = false; }; diff --git a/src/browserfunctions/operationfuncs.cpp b/src/browserfunctions/operationfuncs.cpp index 33a13ff13..3e71a4ab1 100644 --- a/src/browserfunctions/operationfuncs.cpp +++ b/src/browserfunctions/operationfuncs.cpp @@ -5,9 +5,6 @@ #include "DialogUtil.h" #include "GenerationSettings.h" - - - void add_param(BrowserOperation* oper, QString & form, int rank, QString s) { int index = param_begin(form, rank); @@ -120,9 +117,6 @@ void recompute_param(BrowserOperation* oper, int rank, bool recompute) add_param(oper, javaDef, rank, QString(t) + QString(" ") + QString(p)); data->set_javadef(javaDef); } - - - QString phpDef = data->get_phpdef(); if (phpDef.find(p) == -1) @@ -130,21 +124,12 @@ void recompute_param(BrowserOperation* oper, int rank, bool recompute) add_param(oper, phpDef, rank, QString(p) + QString(v)); data->set_phpdef(phpDef); } - - - - QString pythonDef = data->get_pythondef(); if (pythonDef.find(p) == -1) { add_param(oper, pythonDef, rank, QString(p) + QString(v)); data->set_pythondef(pythonDef); } - - - - - QString idlDecl = data->get_idldecl(); if ((idlDecl.find(t) == -1) && (idlDecl.find(p) == -1)) { char d[16]; @@ -153,7 +138,6 @@ void recompute_param(BrowserOperation* oper, int rank, bool recompute) add_param(oper, idlDecl, rank, QString(d) + QString(" ") + QString(t) + QString(" ") + QString(p)); data->set_idldecl(idlDecl); } - } @@ -371,3 +355,137 @@ void renumber(QString & form, int rank, } } } + + + +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, QString text) +{ + // remove + QString form = text; + int index = param_begin(form, rank); + + if (index == -1) + return ""; + + const char * p = form; + 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; +} + +//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); +//} + diff --git a/src/browserfunctions/operationfuncs.h b/src/browserfunctions/operationfuncs.h index 0d1e1c9fd..8c01de7b0 100644 --- a/src/browserfunctions/operationfuncs.h +++ b/src/browserfunctions/operationfuncs.h @@ -2,6 +2,9 @@ #define OPERATIONFUNCS_H #include class BrowserOperation; +class OperationData; + +//void force_param(int rank, OperationData *data, bool recompute); void add_param(BrowserOperation* oper, QString & form, int rank, QString s); void replace_param( QString & form, int rank, QString s); void recompute_param(BrowserOperation* oper, int rank, bool recompute); @@ -15,4 +18,14 @@ int param_begin(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, QString text); +void move_param(int old_rank, int new_rank); +void move_param(int old_rank, int new_rank, + QString proto); + + + + + #endif // OPERATIONFUNCS_H diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 665114e2e..4c192cc29 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -268,6 +268,18 @@ void OperationData::set_deletedp(bool y) create_modified_body_file(); } +void OperationData::remove_param(std::shared_ptr param) +{ + nparams = nparams - 1; + params.removeAll(param); +} + +void OperationData::insert_param(int position, std::shared_ptr param) +{ + nparams = nparams + 1; + params.insert(position, param); +} + void OperationData::clear(bool old) { all.clear(old); @@ -845,6 +857,9 @@ void OperationData::set_n_params(unsigned n) for(int i(0); i < add_count; ++i) params << std::shared_ptr(new ParamData()); } + else if (add_count < 0) + for(int i(0); i < qAbs(add_count); ++i) + params.pop_back(); nparams = params.count(); } @@ -2272,11 +2287,9 @@ void OperationData::send_uml_def(ToolCom * com, BrowserNode * bn, com->write_bool(force_body_gen); unsigned n; - ParamData * p; com->write_unsigned(nparams); n = nparams; - //for (p = params, n = nparams; n; p += 1, n -= 1) for(auto& param : params) { param->send_uml_def(com); diff --git a/src/data/OperationData.h b/src/data/OperationData.h index 3316859f0..8faae0970 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -165,6 +165,9 @@ class OperationData : public ClassMemberData, virtual bool deletedp() const; virtual void set_deletedp(bool y); + void remove_param(std::shared_ptr); + void insert_param(int position, std::shared_ptr param); + void set_browser_node(BrowserOperation *, bool update); virtual QString definition(bool full, bool with_kind) const; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 4f5602b1d..6e2c27a4f 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -814,14 +814,6 @@ void UmlWindow::toolMenuAboutToShow() if (php) toolMenu->insertItem(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(); diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 89670babf..4fce10a7c 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -2807,7 +2807,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); @@ -2819,7 +2819,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); @@ -3150,7 +3150,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); @@ -3162,7 +3162,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); @@ -3174,7 +3174,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; @@ -3916,7 +3916,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) @@ -3936,7 +3936,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); @@ -3948,7 +3948,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; @@ -4294,7 +4294,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; @@ -4319,7 +4319,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); @@ -4331,7 +4331,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); diff --git a/src/douml.pro b/src/douml.pro index 04d06b22c..89ff17ed0 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -586,5 +586,5 @@ FORMS += \ ui/operationwidgetcpp.ui \ ui/constructorinitializerdialog.ui \ ui/catalogwidget.ui \ - CustomWidgets/quickedit.ui + ui/quickedit.ui diff --git a/src/misc/GenerateTypeId.cpp b/src/misc/GenerateTypeId.cpp index 34e384b9c..38ba4f101 100644 --- a/src/misc/GenerateTypeId.cpp +++ b/src/misc/GenerateTypeId.cpp @@ -14,6 +14,7 @@ #include #include #include +#include @@ -59,6 +60,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 id_to_type_map_t; diff --git a/src/misc/mu.cpp b/src/misc/mu.cpp index 08e674e17..48653e987 100644 --- a/src/misc/mu.cpp +++ b/src/misc/mu.cpp @@ -90,7 +90,7 @@ int user_id() } else { int retCode = msg_critical(TR("User Own Identifier"), - TR("\It seems that you are already editing the project.\n\n" + TR("It seems that you are already editing the project.\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)) diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index c00691e77..fb4262164 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -184,7 +184,7 @@ void CatalogWidget::SetupTreeController(QSharedPointer >( new ItemController()); treeController->AddGetter(QPair(0,0), - [] (const BrowserNode* data) + [] (const BrowserNode* data, QModelIndex index) { if(data) return QVariant(data->get_name()); @@ -195,7 +195,7 @@ void CatalogWidget::SetupTreeController(QSharedPointerAddGetter(QPair(0,1), - [] (const BrowserNode* data) + [] (const BrowserNode* data, QModelIndex index) { const QPixmap * pm = data->pixmap(true); if(!pm) diff --git a/src/CustomWidgets/quickedit.ui b/src/ui/quickedit.ui similarity index 90% rename from src/CustomWidgets/quickedit.ui rename to src/ui/quickedit.ui index 158f891e0..a8d6f7e5b 100644 --- a/src/CustomWidgets/quickedit.ui +++ b/src/ui/quickedit.ui @@ -14,7 +14,7 @@ Form - + @@ -147,7 +147,7 @@ - + Qt::Horizontal @@ -160,9 +160,20 @@ - + + + + + Operation + + + + :/root/icons/bullet_add.png:/root/icons/bullet_add.png + + + From 7e902f7bd43dcd9fe227026a6b1d6c9e174ad1cc Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 16 Mar 2013 19:04:31 +0400 Subject: [PATCH 059/297] fixes parameter addition after another has been deleted --- src/CustomWidgets/quickedit.cpp | 11 +++++++---- src/browserfunctions/operationfuncs.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 1c11542f4..d8b28d158 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -13,6 +13,7 @@ #include "browser/BrowserAttribute.h" #include "browser/BrowserRelation.h" #include "browser/BrowserOperationAttribute.h" +#include "browserfunctions/operationfuncs.h" #include "browser/BrowserExtraMember.h" #include "GenerationSettings.h" #include "AttributeData.h" @@ -235,11 +236,11 @@ void QuickEdit::AddParameter() TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); - BrowserNode* operationNode; + BrowserOperation* operationNode; if(currentNode->TypeID() == TypeIdentifier::id()) //, TypeIdentifier()) { - operationNode = currentNode; + operationNode = static_cast(currentNode); } else if(currentNode->TypeID() == TypeIdentifier::id()) { @@ -263,20 +264,22 @@ void QuickEdit::AddParameter() QSharedPointer sharedOfOperation = parent->GetChildren()[insertIndex]; int newItemPosition = currentData->nparams; - if(!treeModel->insertRows(newItemPosition-1, 1, current)) + if(!treeModel->insertRows(sharedOfOperation->childCount(), 1, current)) return; QSharedPointer param(new BrowserOperationAttribute(dummyView,static_cast(operationNode),currentData->params.last())); localNodeHolder.push_back(param); if(!current.isValid()) return; - QModelIndex newItem = treeModel->index(newItemPosition-1,0,current); + QModelIndex newItem = treeModel->index(sharedOfOperation->childCount()-1,0,current); TreeItemInterface *newItemInterface = static_cast(newItem.internalPointer()); TreeItem* newItemAsNode = static_cast*>(newItemInterface); newItemAsNode->SetController(operationAttributeController); newItemAsNode->SetParent(sharedOfOperation); newItemAsNode->SetInternalData(param.data()); operationNode->modified(); + recompute_param(operationNode, newItemPosition-1, true); + //operationNode->renumber(-1); } void QuickEdit::AddOperation() diff --git a/src/browserfunctions/operationfuncs.h b/src/browserfunctions/operationfuncs.h index 8c01de7b0..e8ee5b474 100644 --- a/src/browserfunctions/operationfuncs.h +++ b/src/browserfunctions/operationfuncs.h @@ -4,7 +4,7 @@ class BrowserOperation; class OperationData; -//void force_param(int rank, OperationData *data, bool recompute); + void add_param(BrowserOperation* oper, QString & form, int rank, QString s); void replace_param( QString & form, int rank, QString s); void recompute_param(BrowserOperation* oper, int rank, bool recompute); From 3a621bba1b2812519921c21e2b333dddc2ab2c95 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Mar 2013 00:00:48 +0400 Subject: [PATCH 060/297] can now move operation parameters around in quickedit --- bin/settings.ini | 2 +- src/CustomWidgets/quickedit.cpp | 171 +++++++++++++++--- src/CustomWidgets/quickedit.h | 23 +-- .../quickeditcontrollersetup.cpp | 6 +- src/browser/BrowserNode.cpp | 26 +++ src/browser/BrowserNode.h | 6 + src/browser/BrowserOperationAttribute.cpp | 5 + src/browser/BrowserOperationAttribute.h | 2 + src/ui/catalogwidget.cpp | 4 +- 9 files changed, 202 insertions(+), 43 deletions(-) diff --git a/bin/settings.ini b/bin/settings.ini index 1fe14441a..6821d1cf2 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,7 +10,7 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Import XMI 2.x,Generate XMI 2.x,Generate XMI 1.2,Generate .pro" [headers] -quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6Ü\0\0\0\x15\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x15\0\0\0Û\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x1é\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0)" +quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6x\0\0\0\x16\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x16\0\0\0{\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x1é\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0z\0\0\0\x1\0\0\0\0)" [quickedit_checkboxes] cpp=true diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index d8b28d158..382c721a5 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -107,7 +107,20 @@ void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, Tre void QuickEdit::OnContextMenu(QPoint point) { + CreateMenu(); + + current = ui->tvEditor->selectionModel()->currentIndex(); + if(!current.isValid()) + return; + + current = current.sibling(current.row(), 0); + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); + + if(currentNode->TypeID() != TypeIdentifier::id()) + return; + contextMenu->popup(ui->tvEditor->mapToGlobal(point)); } @@ -153,30 +166,37 @@ void QuickEdit::OnIncreaseOpenLevels() TreeFunctions::ExpandUpToLevel(ui->tvEditor, treeModel, QModelIndex(),level); } -void QuickEdit::OnNewSectionSizes(int, int, int) +void QuickEdit::OnChangeColumnVisibility() { - + CheckColumnVisibility(); } -void QuickEdit::OnChangeColumnVisibility() +void QuickEdit::OnMoveMarkedAfter() { - CheckColumnVisibility(); + MoveMarked(false); } +void QuickEdit::OnMoveMarkedBefore() +{ + MoveMarked(true); +} void QuickEdit::CreateMenu() { if(contextMenu.isNull()) { contextMenu.reset(new QMenu()); - contextMenu->addAction(tr("Remove from favourites"), this, SLOT(OnRemoveCurrentItemFromFavourites())); + } + contextMenu->clear(); + QAction* before = contextMenu->addAction(tr("Move marked before"), this, SLOT(OnMoveMarkedBefore())); + QAction* after = contextMenu->addAction(tr("Move marked after"), this, SLOT(OnMoveMarkedAfter())); + if(BrowserNode::marked_nodes().count() == 0) + { + before->setEnabled(false); + after->setEnabled(false); } } - - - - void QuickEdit::SetupItemCreationFuncs() { itemCreators.insert(UmlClass, std::bind(&QuickEdit::AssignItemsForClass, this, std::placeholders::_1, std::placeholders::_2)); @@ -193,11 +213,6 @@ void QuickEdit::SetupItemCreationFuncs() void QuickEdit::CheckColumnVisibility() { -// columns << "name" << "type" << "default_value" << "stereotype" -// << "visibility" << "static" << "abstract" << "multiplicity" << "direction" -// << "pass" -// << "const" << "volatile" << "friend" << "virtual" << "inline" -// << "default" << "delete" << "override" << "final" << "noexcept"; if(ui->chkCpp->isChecked()) { ui->tvEditor->header()->setSectionHidden(columns.indexOf("pass"),false); @@ -279,7 +294,6 @@ void QuickEdit::AddParameter() newItemAsNode->SetInternalData(param.data()); operationNode->modified(); recompute_param(operationNode, newItemPosition-1, true); - //operationNode->renumber(-1); } void QuickEdit::AddOperation() @@ -349,6 +363,18 @@ BrowserNode *QuickEdit::GetCurrentNode() return itemAsNode; } +QSharedPointer QuickEdit::GetSharedOfOperation(const QModelIndex & index) +{ + QModelIndex parentIndex = index.parent(); + parentIndex = parentIndex.sibling(parentIndex.row(), 0); + TreeItemInterface* parent = static_cast(parentIndex.internalPointer()); + if(!parent) + parent = treeModel->RootItem(); + TreeItemInterface *itemAsInterface = static_cast(index.internalPointer()); + int operationIndex = parent->GetIndexOfChild(itemAsInterface); + return parent->GetChildren()[operationIndex]; +} + QList > QuickEdit::CreateCheckList() { QList > result; @@ -396,12 +422,9 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) originalView = view; mainWindow = window; nullController = QSharedPointer > (new ItemController()); - //validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, - // UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember}; validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember, UmlClassView, UmlPackage}; - //validTypes = {UmlClass, UmlOperation, UmlAttribute}; - columns << "name" << "type" << "default_value" << "stereotype" << "deleted" + columns << "name" << "mark" << "type" << "default_value" << "stereotype" << "deleted" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" << "pass" << "const" << "volatile" << "friend" << "virtual" << "inline" @@ -415,7 +438,7 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) //ui->tvEditor->setStyleSheet("QTreeView::item { border-right: 1px solid black }"); ui->tvEditor->setAlternatingRowColors(true); - //connect(ui->tvEditor, SIGNAL(customContextMenuRequested(QPoint)),this, SLOT(OnContextMenu(QPoint))); + 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())); @@ -482,6 +505,7 @@ void QuickEdit::closeEvent(QCloseEvent *) settings.setValue("quickedit_checkboxes/python", ui->chkPython->isChecked()); settings.setValue("quickedit_checkboxes/idl", ui->chkIdl->isChecked()); ui->leSearch->setText(""); + localNodeHolder.clear(); } QSharedPointer QuickEdit::CreateInterfaceNode(QSharedPointer root, @@ -546,8 +570,6 @@ void QuickEdit::AssignItemsForClassView(QSharedPointer root, UmlCode nodeType = child->get_type(); itemCreators[nodeType](root, child); } -// root->AddChildren(QList >() << interfaceItem); - } void QuickEdit::AssignItemsForPackage(QSharedPointer root, BrowserNode * packageNode) @@ -564,7 +586,107 @@ void QuickEdit::AssignItemsForPackage(QSharedPointer root, Br UmlCode nodeType = child->get_type(); itemCreators[nodeType](root, child); } -// root->AddChildren(QList >() << interfaceItem); +} + +void QuickEdit::MoveMarked(bool before) +{ + QModelIndex current = ui->tvEditor->currentIndex(); + + if(!current.isValid()) + return; + + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); + + //next we reorganize nodes in parent + TreeItemInterface* parentInterface = itemAsInterface->parent(); + QList> children = parentInterface->GetChildren(); + QList> markedChildren; + // we store all marked nodes + QList parentList; + for(QSharedPointer child : children) + { + BrowserNode* childNode = static_cast(child->InternalPointer()); + if(!parentList.contains(static_cast(childNode->parent()))) + parentList.append(static_cast(childNode->parent())); + if(childNode->markedp()) + markedChildren.append(child); + } + + if(parentList.size() > 1) + return; + + // remove all marked from children + for(QSharedPointer child : markedChildren) + { + children.remove(child); + } + //get the new position of origin node + int newPositionOfCurrent = -1; + for(QSharedPointer child : children) + { + newPositionOfCurrent++; + BrowserNode* childNode = static_cast(child->InternalPointer()); + if(childNode == currentNode) + { + if(!before) + newPositionOfCurrent++; + break; + } + } + //insert the nodes back + std::reverse(markedChildren.begin(), markedChildren.end()); + for(QSharedPointer child : markedChildren) + { + children.insert(newPositionOfCurrent, child); + } + + QSharedPointer sharedOfOperation = GetSharedOfOperation(current.parent()); + TreeItem* operationItemAsNode = static_cast*>(sharedOfOperation.data()); + // reorganize params vector + + BrowserOperation* operationNode = static_cast(operationItemAsNode->InternalPointer()); + OperationData* operationData = static_cast(operationNode->get_data()); + operationData->params.clear(); + for(QSharedPointer child : children) + { + BrowserOperationAttribute* attributeNode = static_cast(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(QSharedPointer child : children) + { + pos++; + QModelIndex newItem = treeModel->index(pos,0,parentIndex); + if(!newItem.isValid()) + continue; + TreeItemInterface *newItemInterface = static_cast(newItem.internalPointer()); + TreeItem* newItemAsNode = static_cast*>(newItemInterface); + newItemAsNode->SetController(operationAttributeController); + newItemAsNode->SetParent(sharedOfOperation); + newItemAsNode->SetInternalData(static_cast(child->InternalPointer())); + } + pos = -1; + for(QSharedPointer child : children) + { + pos++; + QModelIndex newItem = treeModel->index(pos,0,parentIndex); + if(!newItem.isValid()) + continue; + BrowserNode* node = static_cast(child->InternalPointer()); + node->set_marked(false); + } + + QModelIndex newItem = treeModel->index(pos,0,parentIndex); + if(newItem.isValid()) + pos++; + operationNode->modified(); + } void QuickEdit::AssignItemsForOperation(QSharedPointer root, BrowserNode * node) @@ -579,11 +701,9 @@ void QuickEdit::AssignItemsForOperation(QSharedPointer root, operationNodes << returnType; // next we make dummy nodes for all attributes int paramCount = ((OperationData*)operationNode->get_data())->nparams; - //items << CreateInterfaceNode(interfaceItem, nullController, returnType.data()); for(int i(0); i< paramCount; ++i) { - //ParamData* data = ((OperationData*)operationNode->get_data())->params[i].get(); QSharedPointer param(new BrowserOperationAttribute(dummyView,operationNode, ((OperationData*)operationNode->get_data())->params[i])); operationNodes << param; @@ -635,6 +755,7 @@ void QuickEdit::CheckBoxDelegateSetup() 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); } diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 57ee1294c..994a29efc 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -45,7 +45,6 @@ class QuickEdit : public QWidget QList > localNodeHolder; QHash, BrowserNode*) > > itemCreators; - // visited treeview TreeModel* treeModel = nullptr; bool isFiltered = false; QStringList expandedNodes; @@ -75,15 +74,7 @@ class QuickEdit : public QWidget QStringList columns; -// std::function classFlagFunctor; -// std::function operationFlagFunctor; -// std::function attributeFlagFunctor; -// std::function operationReturnTypeFlagFunctor; -// std::function operationAttributeFlagFunctor; -// std::function extraNodeFlagFunctor; -// QSharedPointer > classviewFlagFunctor; -// QSharedPointer > packageFlagFunctor; - + QModelIndex current; void SetupTreeModel(TreeModel*& , QTreeView*, QSharedPointer&, @@ -113,18 +104,22 @@ class QuickEdit : public QWidget void AddParameter(); void AddOperation(); + + BrowserNode* GetCurrentNode(); + QSharedPointer GetSharedOfOperation(const QModelIndex& ); QSharedPointer CreateInterfaceNode(QSharedPointer root, QSharedPointer > controller, BrowserNode *node); void AssignItemsForOperation(QSharedPointer root,BrowserNode*); void AssignItemsForClass(QSharedPointer root,BrowserNode*); void AssignItemsForAttribute(QSharedPointer root,BrowserNode*); - void AssignItemsForRelation(QSharedPointer root, BrowserNode * classNode); + void AssignItemsForRelation(QSharedPointer root, BrowserNode *); void AssignItemsForExtraNode(QSharedPointer root,BrowserNode*); void AssignItemsForClassView(QSharedPointer root,BrowserNode*); void AssignItemsForPackage(QSharedPointer root,BrowserNode*); -// void AssignItemsForAggregation(QSharedPointer root,BrowserNode*); + + void MoveMarked(bool); public slots: void OnContextMenu(QPoint); @@ -134,9 +129,9 @@ class QuickEdit : public QWidget void OnPerformFiltering(QString); void OnDecreaseOpenLevels(); void OnIncreaseOpenLevels(); - void OnNewSectionSizes(int,int,int); void OnChangeColumnVisibility(); - //void OnPerformFiltering(QString); + void OnMoveMarkedAfter(); + void OnMoveMarkedBefore(); }; diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index f5159efdd..9c012c086 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -409,6 +409,9 @@ void QuickEdit::SetupOperationAttributeController() ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("mark"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toBool, markedp, set_marked); + operationAttributeController->AddGetter(columns.indexOf("deleted"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), [] (const BrowserNode* data, const QModelIndex& index) { @@ -459,7 +462,8 @@ void QuickEdit::SetupOperationAttributeController() { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(columns.indexOf("name"),columns.indexOf("type"),columns.indexOf("default"),columns.indexOf("direction"), columns.indexOf("deleted")))) + if(!(index.column() *in(columns.indexOf("name"),columns.indexOf("type"),columns.indexOf("default"), + columns.indexOf("direction"), columns.indexOf("deleted"), columns.indexOf("mark")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 194c0d641..909fc9435 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1274,6 +1274,32 @@ void BrowserNode::toggle_mark() viewptr->send_marked(get_marked_nodes()); } +void BrowserNode::set_marked(bool value) +{ + is_marked = value; + if (value) { + marked_list.append(this); + } + else { + marked_list.removeRef(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 diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index 34cb304ac..a83052346 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -85,6 +85,7 @@ class BrowserNode : public Q3ListViewItem, bool is_read_only = false; bool is_edited = false; bool is_marked = false; + //bool is_marked_for_move = false; bool is_defined = false; // to indicate unconsistency due to projectSynchro // pre condition not followed @@ -132,6 +133,7 @@ class BrowserNode : public Q3ListViewItem, void mark_shortcut(QString s, int & index, int bias); void mark_management(int choice); void toggle_mark(); + void set_marked(bool value);//{is_marked = value;} bool markedp() const { return is_marked; } @@ -152,6 +154,10 @@ class BrowserNode : public Q3ListViewItem, static void setup_generatable_types(); static void unmark_all(); +// bool marked_for_move(){return is_marked_for_move;} +// void set_marked_for_move(bool value){ is_marked_for_move = value;} + + bool is_from_lib() const { return original_id != 0; } diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp index c13697435..1c6c40ee6 100644 --- a/src/browser/BrowserOperationAttribute.cpp +++ b/src/browser/BrowserOperationAttribute.cpp @@ -26,6 +26,11 @@ BrowserOperationAttribute::BrowserOperationAttribute(BrowserView* view, BrowserO } +BrowserOperationAttribute::~BrowserOperationAttribute() +{ + //set_marked(false); +} + void BrowserOperationAttribute::set_name(QString value) { param->set_name(value); diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index 3ff43ed0d..db96cfa23 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -35,6 +35,7 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove public: BrowserOperationAttribute(BrowserView* view, BrowserOperation* _operation, std::shared_ptr _data); + ~BrowserOperationAttribute(); BrowserOperation* get_operation(){return operation;} void set_name(QString); QString get_name() const; @@ -61,6 +62,7 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove virtual uint TypeID(); bool deletedp() const; void set_deleted(bool, int position = 0); + std::shared_ptr get_param() {return param;} bool isDeleted = false; diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index fb4262164..d08246a04 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -184,7 +184,7 @@ void CatalogWidget::SetupTreeController(QSharedPointer >( new ItemController()); treeController->AddGetter(QPair(0,0), - [] (const BrowserNode* data, QModelIndex index) + [] (const BrowserNode* data, QModelIndex ) { if(data) return QVariant(data->get_name()); @@ -195,7 +195,7 @@ void CatalogWidget::SetupTreeController(QSharedPointerAddGetter(QPair(0,1), - [] (const BrowserNode* data, QModelIndex index) + [] (const BrowserNode* data, QModelIndex ) { const QPixmap * pm = data->pixmap(true); if(!pm) From d4b2340465a4ed8c46264fb716298760ddf7f705 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Mar 2013 02:55:38 +0400 Subject: [PATCH 061/297] correctly extracting pass type and specifier --- bin/settings.ini | 2 +- src/CustomWidgets/quickedit.cpp | 4 +- .../quickeditcontrollersetup.cpp | 61 ++++++++++++++++++- src/browser/BrowserOperationAttribute.cpp | 22 +++++-- src/browser/BrowserOperationAttribute.h | 8 ++- src/browserfunctions/operationfuncs.cpp | 37 +++++++++++ src/browserfunctions/operationfuncs.h | 4 ++ src/dialog/OperationDialog.cpp | 3 +- 8 files changed, 128 insertions(+), 13 deletions(-) diff --git a/bin/settings.ini b/bin/settings.ini index 6821d1cf2..e27fbc00a 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,7 +10,7 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Import XMI 2.x,Generate XMI 2.x,Generate XMI 1.2,Generate .pro" [headers] -quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6x\0\0\0\x16\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x16\0\0\0{\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0&\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0<\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\x1é\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0z\0\0\0\x1\0\0\0\0)" +quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6x\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\0{\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0O\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0/\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0\x63\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0%\0\0\0\x1\0\0\0\0\0\0\x1Ý\0\0\0\x1\0\0\0\0)" [quickedit_checkboxes] cpp=true diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 382c721a5..83f7c5430 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -424,9 +424,9 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) nullController = QSharedPointer > (new ItemController()); validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember, UmlClassView, UmlPackage}; - columns << "name" << "mark" << "type" << "default_value" << "stereotype" << "deleted" + columns << "name" << "mark" << "prefix" << "type" << "postfix" << "default_value" << "stereotype" << "deleted" << "visibility" << "static" << "abstract" << "multiplicity" << "direction" - << "pass" + << "const" << "volatile" << "friend" << "virtual" << "inline" << "default" << "delete" << "override" << "final" << "noexcept"; SetupItemCreationFuncs(); diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 9c012c086..383a2bc3d 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -409,6 +409,9 @@ void QuickEdit::SetupOperationAttributeController() ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); +// ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("prefix"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// toString, get_specifier, set_specifier); + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("mark"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool, markedp, set_marked); @@ -440,6 +443,61 @@ void QuickEdit::SetupOperationAttributeController() } ); + operationAttributeController->AddGetter(columns.indexOf("prefix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data, const QModelIndex& index) +{ + Q_UNUSED(index); + if(!data) + return QVariant(); + const BrowserOperationAttribute* pointer = static_cast(data); + if(pointer) + return QVariant(pointer->get_specifier(index.row())); + else + return QVariant(); + } + ); + operationAttributeController->AddSetter(columns.indexOf("prefix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (BrowserNode* data, QVariant value, const QModelIndex& index) + { + if(!data) + return false; + BrowserOperationAttribute* pointer = static_cast(data); + if(pointer) + { + pointer->set_specifier(value.toString(), index.row()); + pointer->modified(); + } + return true; + } + ); + + operationAttributeController->AddGetter(columns.indexOf("postfix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (const BrowserNode* data, const QModelIndex& index) +{ + Q_UNUSED(index); + if(!data) + return QVariant(); + const BrowserOperationAttribute* pointer = static_cast(data); + if(pointer) + return QVariant(pointer->get_passage_type(index.row())); + else + return QVariant(); + } + ); + operationAttributeController->AddSetter(columns.indexOf("postfix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + [] (BrowserNode* data, QVariant value, const QModelIndex& index) + { + if(!data) + return false; + BrowserOperationAttribute* pointer = static_cast(data); + if(pointer) + { + pointer->set_passage_type(value.toString(), index.row()); + pointer->modified(); + } + return true; + } + ); @@ -463,7 +521,8 @@ void QuickEdit::SetupOperationAttributeController() Qt::ItemFlags result; result |= Qt::ItemIsSelectable; if(!(index.column() *in(columns.indexOf("name"),columns.indexOf("type"),columns.indexOf("default"), - columns.indexOf("direction"), columns.indexOf("deleted"), columns.indexOf("mark")))) + columns.indexOf("direction"), columns.indexOf("deleted"), columns.indexOf("mark"), + columns.indexOf("prefix"), columns.indexOf("postfix")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp index 1c6c40ee6..8f86a3ffa 100644 --- a/src/browser/BrowserOperationAttribute.cpp +++ b/src/browser/BrowserOperationAttribute.cpp @@ -28,7 +28,7 @@ BrowserOperationAttribute::BrowserOperationAttribute(BrowserView* view, BrowserO BrowserOperationAttribute::~BrowserOperationAttribute() { - //set_marked(false); + set_marked(false); } void BrowserOperationAttribute::set_name(QString value) @@ -92,13 +92,15 @@ QString BrowserOperationAttribute::get_default_value() const return param->get_default_value(); } -void BrowserOperationAttribute::set_passage_type(QString) +void BrowserOperationAttribute::set_passage_type(QString , int position) { + } -QString BrowserOperationAttribute::get_passage_type() const +QString BrowserOperationAttribute::get_passage_type(int position) const { - return QString(); + OperationData* data = (OperationData*)operation->get_data(); + return extract_pointer(position, data->get_cppdecl()); } const QPixmap *BrowserOperationAttribute::pixmap(int) const @@ -168,9 +170,17 @@ void BrowserOperationAttribute::set_deleted(bool value, int position) data->insert_param(position, param); recompute_param(operation, position, true); - //renumber(form, rank, 1); - isDeleted = false; } } + +QString BrowserOperationAttribute::get_specifier(int position) const +{ + OperationData* data = (OperationData*)operation->get_data(); + return extract_specifier(position, data->get_cppdecl()); +} + +void BrowserOperationAttribute::set_specifier(QString value, int position) +{ +} diff --git a/src/browser/BrowserOperationAttribute.h b/src/browser/BrowserOperationAttribute.h index db96cfa23..8a8fc0c95 100644 --- a/src/browser/BrowserOperationAttribute.h +++ b/src/browser/BrowserOperationAttribute.h @@ -45,8 +45,7 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove AType get_param_type() const; void set_default_value(QString); QString get_default_value() const; - void set_passage_type(QString); - QString get_passage_type() const; + bool is_writable() const { if(operation) @@ -64,6 +63,11 @@ class BrowserOperationAttribute: public BrowserNodeAbstractRemove void set_deleted(bool, int position = 0); std::shared_ptr get_param() {return param;} + QString get_specifier(int position) const; + void set_specifier(QString value, int position); + void set_passage_type(QString, int position); + QString get_passage_type(int position) const; + bool isDeleted = false; }; diff --git a/src/browserfunctions/operationfuncs.cpp b/src/browserfunctions/operationfuncs.cpp index 3e71a4ab1..afacfe59c 100644 --- a/src/browserfunctions/operationfuncs.cpp +++ b/src/browserfunctions/operationfuncs.cpp @@ -441,6 +441,43 @@ QString delete_param(int rank, QString text) return form; } + +QString extract_specifier(int position, 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(); + + QRegExp rxType(QRegExp::escape("${t" + QString::number(position))); + int tIndex = rxType.indexIn(s); + int length = tIndex -(startIndex + 1); + QString specifier; + if(length > 0) + specifier = s.mid(startIndex + 1, length); + return specifier; +} + +QString extract_pointer(int position, 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 + 1); + QString ptrType; + if(length > 0) + ptrType = s.mid(startIndex + 1, length); + return ptrType; +} + //void move_param(int old_rank, int new_rank) //{ // switch (unique) { diff --git a/src/browserfunctions/operationfuncs.h b/src/browserfunctions/operationfuncs.h index e8ee5b474..6d0c635e4 100644 --- a/src/browserfunctions/operationfuncs.h +++ b/src/browserfunctions/operationfuncs.h @@ -26,6 +26,10 @@ void move_param(int old_rank, int new_rank, +QString extract_specifier(int position, QString s); +QString extract_pointer(int position, QString s); + + #endif // OPERATIONFUNCS_H diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 4fce10a7c..7a4666967 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -1559,7 +1559,8 @@ void OperationDialog::cpp_edit_param_decl() int index; if (((index = form.find("${(}")) != 0) && - (form.find("${)}", index + 4) != 0)) { + (form.find("${)}", index + 4) != 0)) + { CppParamsDialog d(this, table, cppTab->ui->edCppDeclProto, TRUE); if (d.exec() == QDialog::Accepted) From e1c328a206461a30b4ad589b4e76ed9abbe00c0a Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Mar 2013 03:36:52 +0400 Subject: [PATCH 062/297] Fully functional c++ part in quickedit --- bin/settings.ini | 4 +- src/CustomWidgets/quickedit.cpp | 22 +++++--- src/CustomWidgets/quickedit.h | 2 +- .../quickeditcontrollersetup.cpp | 14 ++--- src/browser/BrowserNode.cpp | 10 ++-- src/browser/BrowserOperationAttribute.cpp | 15 +++--- src/browserfunctions/operationfuncs.cpp | 53 +++++++++++++++++-- src/browserfunctions/operationfuncs.h | 10 ++-- src/diagram/UmlWindow.cpp | 2 - src/dialog/OperationDialog.cpp | 26 ++++----- 10 files changed, 104 insertions(+), 54 deletions(-) diff --git a/bin/settings.ini b/bin/settings.ini index e27fbc00a..0a791bdcd 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,10 +10,10 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Import XMI 2.x,Generate XMI 2.x,Generate XMI 1.2,Generate .pro" [headers] -quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6x\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\0{\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0O\0\0\0\x1\0\0\0\0\0\0\0N\0\0\0\x1\0\0\0\0\0\0\0/\0\0\0\x1\0\0\0\0\0\0\0\x34\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0:\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0 \0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0\x63\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0)\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0,\0\0\0\x1\0\0\0\0\0\0\0\x33\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0%\0\0\0\x1\0\0\0\0\0\0\x1Ý\0\0\0\x1\0\0\0\0)" +quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x17hà;\0\0\0\v\0\0\0\x10\0\0\0.\0\0\0\xf\0\0\0(\0\0\0\xe\0\0\0$\0\0\0\r\0\0\0#\0\0\0\x6\0\0\0L\0\0\0\x5\0\0\0+\0\0\0\x15\0\0\0\x64\0\0\0\x3\0\0\0,\0\0\0\x14\0\0\0\x38\0\0\0\x13\0\0\0-\0\0\0\x11\0\0\0!\0\0\x6g\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x10\0\0\0›\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x3\0\0\0\0\0\0\x3Ä\0\0\0\x1\0\0\0\0)" [quickedit_checkboxes] -cpp=true +cpp=false java=false php=false python=false diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 83f7c5430..79546c517 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -110,7 +110,7 @@ void QuickEdit::OnContextMenu(QPoint point) CreateMenu(); - current = ui->tvEditor->selectionModel()->currentIndex(); + QModelIndex current = ui->tvEditor->selectionModel()->currentIndex(); if(!current.isValid()) return; @@ -221,10 +221,13 @@ void QuickEdit::CheckColumnVisibility() ui->tvEditor->header()->setSectionHidden(columns.indexOf("friend"),false); ui->tvEditor->header()->setSectionHidden(columns.indexOf("virtual"),false); ui->tvEditor->header()->setSectionHidden(columns.indexOf("inline"),false); - ui->tvEditor->header()->setSectionHidden(columns.indexOf("default"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("defaulted"),false); ui->tvEditor->header()->setSectionHidden(columns.indexOf("delete"),false); ui->tvEditor->header()->setSectionHidden(columns.indexOf("override"),false); ui->tvEditor->header()->setSectionHidden(columns.indexOf("final"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("default_value"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("prefix"),false); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("postfix"),false); } else { @@ -234,10 +237,13 @@ void QuickEdit::CheckColumnVisibility() ui->tvEditor->header()->setSectionHidden(columns.indexOf("friend"),true); ui->tvEditor->header()->setSectionHidden(columns.indexOf("virtual"),true); ui->tvEditor->header()->setSectionHidden(columns.indexOf("inline"),true); - ui->tvEditor->header()->setSectionHidden(columns.indexOf("default"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("defaulted"),true); ui->tvEditor->header()->setSectionHidden(columns.indexOf("delete"),true); ui->tvEditor->header()->setSectionHidden(columns.indexOf("override"),true); ui->tvEditor->header()->setSectionHidden(columns.indexOf("final"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("default_value"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("prefix"),true); + ui->tvEditor->header()->setSectionHidden(columns.indexOf("postfix"),true); } } @@ -293,7 +299,7 @@ void QuickEdit::AddParameter() newItemAsNode->SetParent(sharedOfOperation); newItemAsNode->SetInternalData(param.data()); operationNode->modified(); - recompute_param(operationNode, newItemPosition-1, true); + OperationFuncs::recompute_param(operationNode, newItemPosition-1, true); } void QuickEdit::AddOperation() @@ -424,11 +430,11 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) nullController = QSharedPointer > (new ItemController()); validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember, UmlClassView, UmlPackage}; - columns << "name" << "mark" << "prefix" << "type" << "postfix" << "default_value" << "stereotype" << "deleted" - << "visibility" << "static" << "abstract" << "multiplicity" << "direction" + columns << "name" << "mark" << "deleted" << "prefix" << "type" << "postfix" << "default_value" << "stereotype" + << "visibility" << "direction" << "static" << "abstract" << "multiplicity" << "const" << "volatile" << "friend" << "virtual" << "inline" - << "default" << "delete" << "override" << "final" << "noexcept"; + << "defaulted" << "delete" << "override" << "final" << "noexcept"; SetupItemCreationFuncs(); qRegisterMetaType>("QList"); SetupControllers(); @@ -750,7 +756,7 @@ void QuickEdit::CheckBoxDelegateSetup() 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("default"), 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); diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 994a29efc..719f8ddc0 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -74,7 +74,7 @@ class QuickEdit : public QWidget QStringList columns; - QModelIndex current; + //QModelIndex current; void SetupTreeModel(TreeModel*& , QTreeView*, QSharedPointer&, diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 383a2bc3d..565ea0bfb 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -290,7 +290,7 @@ void QuickEdit::SetupOperationController() ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("inline"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_inline, set_cpp_inline); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("defaulted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_default, set_cpp_default); ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("delete"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_delete, set_cpp_delete); @@ -321,7 +321,7 @@ void QuickEdit::SetupOperationController() 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("default"),columns.indexOf("delete"),columns.indexOf("override"),columns.indexOf("final"), columns.indexOf("deleted")))) + ,columns.indexOf("defaulted"),columns.indexOf("delete"),columns.indexOf("override"),columns.indexOf("final"), columns.indexOf("deleted")))) return result; TreeItemInterface* iface = static_cast(index.internalPointer()); @@ -346,7 +346,7 @@ void QuickEdit::SetupAttributeController() toString, get_name, set_name); ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_type().get_type, set_type); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("default_value"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_init_value, set_init_value); ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("stereotype"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_stereotype, def->set_stereotype); @@ -376,7 +376,7 @@ void QuickEdit::SetupAttributeController() { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(columns.indexOf("name"),columns.indexOf("type"),columns.indexOf("default"),columns.indexOf("stereotype"), + 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; @@ -402,7 +402,7 @@ void QuickEdit::SetupOperationAttributeController() toString, get_name, set_name); ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("default_value"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_default_value, set_default_value); ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("direction"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_direction, set_direction); @@ -506,7 +506,7 @@ void QuickEdit::SetupOperationAttributeController() std::function f = [](BrowserNode* node, const QModelIndex& index) { BrowserOperationAttribute* oper = static_cast(node); - recompute_param(oper->get_operation(),index.row(),true); + OperationFuncs::recompute_param(oper->get_operation(),index.row(),true); }; operationAttributeController->AddPostProcessors(columns.indexOf("direction"), QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); @@ -520,7 +520,7 @@ void QuickEdit::SetupOperationAttributeController() { Qt::ItemFlags result; result |= Qt::ItemIsSelectable; - if(!(index.column() *in(columns.indexOf("name"),columns.indexOf("type"),columns.indexOf("default"), + 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; diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 909fc9435..f4e9bc725 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1285,13 +1285,13 @@ void BrowserNode::set_marked(bool value) } - repaint(); + //repaint(); - if (BrowserSearchDialog::get() != 0) - BrowserSearchDialog::get()->update(); +// if (BrowserSearchDialog::get() != 0) +// BrowserSearchDialog::get()->update(); - if (ReferenceDialog::get() != 0) - ReferenceDialog::get()->update(); +// if (ReferenceDialog::get() != 0) +// ReferenceDialog::get()->update(); if(marked_list.count() != 0) UmlWindow::set_marked_generation(); else diff --git a/src/browser/BrowserOperationAttribute.cpp b/src/browser/BrowserOperationAttribute.cpp index 8f86a3ffa..c2d22372b 100644 --- a/src/browser/BrowserOperationAttribute.cpp +++ b/src/browser/BrowserOperationAttribute.cpp @@ -92,15 +92,16 @@ QString BrowserOperationAttribute::get_default_value() const return param->get_default_value(); } -void BrowserOperationAttribute::set_passage_type(QString , int position) +void BrowserOperationAttribute::set_passage_type(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 extract_pointer(position, data->get_cppdecl()); + return OperationFuncs::extract_pointer(position, data->get_cppdecl()); } const QPixmap *BrowserOperationAttribute::pixmap(int) const @@ -162,13 +163,13 @@ void BrowserOperationAttribute::set_deleted(bool value, int position) if(value) { data->remove_param(param); - delete_param(position, data); + OperationFuncs::delete_param(position, data); isDeleted = true; } else { data->insert_param(position, param); - recompute_param(operation, position, true); + OperationFuncs::recompute_param(operation, position, true); isDeleted = false; } @@ -178,9 +179,11 @@ void BrowserOperationAttribute::set_deleted(bool value, int position) QString BrowserOperationAttribute::get_specifier(int position) const { OperationData* data = (OperationData*)operation->get_data(); - return extract_specifier(position, data->get_cppdecl()); + return OperationFuncs::extract_specifier(position, data->get_cppdecl()); } void BrowserOperationAttribute::set_specifier(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/browserfunctions/operationfuncs.cpp b/src/browserfunctions/operationfuncs.cpp index afacfe59c..8639c3764 100644 --- a/src/browserfunctions/operationfuncs.cpp +++ b/src/browserfunctions/operationfuncs.cpp @@ -4,7 +4,8 @@ #include "OperationData.h" #include "DialogUtil.h" #include "GenerationSettings.h" - +namespace OperationFuncs +{ void add_param(BrowserOperation* oper, QString & form, int rank, QString s) { int index = param_begin(form, rank); @@ -452,13 +453,15 @@ QString extract_specifier(int position, QString s) 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 + 1); + int length = tIndex -(startIndex); QString specifier; if(length > 0) - specifier = s.mid(startIndex + 1, length); + specifier = s.mid(startIndex, length); return specifier; } @@ -471,13 +474,52 @@ QString extract_pointer(int position, QString s) QRegExp rxEnd(QRegExp::escape("${p" + QString::number(position)+ "}")); int tIndex = rxEnd.indexIn(s); - int length = tIndex -(startIndex + 1); + int length = tIndex -(startIndex); QString ptrType; if(length > 0) - ptrType = s.mid(startIndex + 1, length); + ptrType = s.mid(startIndex, length); return ptrType; } +QString set_specifier(int position, QString s, 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); + int length = tIndex -(startIndex + 1); + if(length < 0) + length = 0; + //s = s.replace(startIndex,length,newValue); + s = s.left(startIndex) + newValue + s.right(s.length() - tIndex); + return s; +} + +QString set_pointer(int position, QString s, 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); + int length = tIndex -(startIndex + 1); + if(length < 0) + length = 0; + //s = s.replace(startIndex,length,newValue); + s = s.left(startIndex) + newValue + s.right(s.length() - tIndex); + return s; +} + + //void move_param(int old_rank, int new_rank) //{ // switch (unique) { @@ -526,3 +568,4 @@ QString extract_pointer(int position, QString s) // ed->setText(form); //} +} diff --git a/src/browserfunctions/operationfuncs.h b/src/browserfunctions/operationfuncs.h index 6d0c635e4..f08997990 100644 --- a/src/browserfunctions/operationfuncs.h +++ b/src/browserfunctions/operationfuncs.h @@ -4,7 +4,8 @@ class BrowserOperation; class OperationData; - +namespace OperationFuncs +{ void add_param(BrowserOperation* oper, QString & form, int rank, QString s); void replace_param( QString & form, int rank, QString s); void recompute_param(BrowserOperation* oper, int rank, bool recompute); @@ -24,12 +25,11 @@ void move_param(int old_rank, int new_rank); void move_param(int old_rank, int new_rank, QString proto); - - QString extract_specifier(int position, QString s); QString extract_pointer(int position, QString s); - - +QString set_specifier(int position, QString s, QString newValue); +QString set_pointer(int position, QString s, QString newValue); +} #endif // OPERATIONFUNCS_H diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 6e2c27a4f..32ed2ca77 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -1274,7 +1274,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() @@ -1283,7 +1282,6 @@ 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() diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 7a4666967..023986fdd 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -4468,7 +4468,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; @@ -4489,7 +4489,7 @@ 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; @@ -4512,7 +4512,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 ',': @@ -4562,7 +4562,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); } @@ -4600,7 +4600,7 @@ 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 ""; @@ -4615,12 +4615,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; } @@ -4664,7 +4664,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; @@ -4708,11 +4708,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); @@ -5711,7 +5711,7 @@ 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, strindex); if (s.mid(strindex, sup - strindex).stripWhiteSpace().isEmpty()) return FALSE; @@ -6308,7 +6308,7 @@ 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, strindex); if (s.mid(strindex, sup - strindex).stripWhiteSpace().isEmpty()) return FALSE; @@ -6858,7 +6858,7 @@ 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, strindex); if (s.mid(strindex, sup - strindex).stripWhiteSpace().isEmpty()) return FALSE; From 5fb5e643e389780d0c1d6d88736d7bbb71e054fe Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 17 Mar 2013 13:51:22 +0400 Subject: [PATCH 063/297] 1. Duplicating class, operation and attribute produces its name in the name request edit. 2. Expanded QuickEdit to manage almost all necessary c++ stuff 3. Added "refresh" button for quickedit --- README.md | 3 +- bin/settings.ini | 7 +- changelog.txt | 19 ++++ src/CustomWidgets/quickedit.cpp | 102 +++++++++++++++++- src/CustomWidgets/quickedit.h | 7 +- .../quickeditcontrollersetup.cpp | 2 + src/browser/BrowserAttribute.cpp | 2 +- src/browser/BrowserClass.cpp | 21 +++- src/browser/BrowserClass.h | 6 +- src/browser/BrowserNode.cpp | 6 +- src/browser/BrowserOperation.cpp | 2 +- src/diagram/UmlWindow.cpp | 5 +- src/icons.qrc | 1 + src/icons/arrow_refresh.png | Bin 0 -> 2281 bytes src/ui/quickedit.ui | 42 +++++--- 15 files changed, 191 insertions(+), 34 deletions(-) create mode 100644 src/icons/arrow_refresh.png diff --git a/README.md b/README.md index a20dbd34e..089e15749 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,8 @@ Enchancements: * 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 + * A totally new control can be brought up by pressing Ctlr-E on tree nodes. See changelog.txt for details. (section 1.0b4) + Manual ------ diff --git a/bin/settings.ini b/bin/settings.ini index 0a791bdcd..02a10e8e0 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,11 +10,14 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Import XMI 2.x,Generate XMI 2.x,Generate XMI 1.2,Generate .pro" [headers] -quickedit="@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x17hà;\0\0\0\v\0\0\0\x10\0\0\0.\0\0\0\xf\0\0\0(\0\0\0\xe\0\0\0$\0\0\0\r\0\0\0#\0\0\0\x6\0\0\0L\0\0\0\x5\0\0\0+\0\0\0\x15\0\0\0\x64\0\0\0\x3\0\0\0,\0\0\0\x14\0\0\0\x38\0\0\0\x13\0\0\0-\0\0\0\x11\0\0\0!\0\0\x6g\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x10\0\0\0›\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x2\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x3\0\0\0\0\0\0\x3Ä\0\0\0\x1\0\0\0\0)" +quickedit=@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6g\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\0›\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0) [quickedit_checkboxes] -cpp=false +cpp=true java=false php=false python=false idl=false + +[window] +size=@Size(-1 -1) diff --git a/changelog.txt b/changelog.txt index 10543a636..9228db3b7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,22 @@ +v1.0b5 + 1. Duplicating class, operation and attribute produces its name in the name request edit. + 2. Vastly expanded functionality of Quickedit window. + 0. Repeatedly pressing "ctrl-e" closes it if it is already open + 1. It will remember the state it was in prior to close and restore itself accordingly. + 2. 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) + 3. You can add operation by clicking on +Operation button if you are currently on the operation or class node. + 4. You can add operation parameters by clicking on +Parameter button if you are on an attribute or operation node. + 5. 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. + 6. 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" + 7. 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. diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 79546c517..7a86e4fe2 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -82,6 +82,7 @@ QuickEdit::QuickEdit(QWidget *parent) : ui(new Ui::QuickEdit) { ui->setupUi(this); + this->setWindowTitle(QObject::tr("Quick Edit")); if(!dummyView) dummyView = new BrowserView(); } @@ -126,10 +127,10 @@ void QuickEdit::OnContextMenu(QPoint point) void QuickEdit::OnShow() { - BrowserNode* current = static_cast(originalView->currentItem()); - if(!current) + currentNode = static_cast(originalView->currentItem()); + if(!currentNode) return; - Show(current); + Show(currentNode); } void QuickEdit::OnAddParameter() @@ -181,6 +182,11 @@ void QuickEdit::OnMoveMarkedBefore() MoveMarked(true); } +void QuickEdit::OnRefreshTable() +{ + RefreshTable(); +} + void QuickEdit::CreateMenu() { if(contextMenu.isNull()) @@ -361,6 +367,12 @@ void QuickEdit::AddOperation() //classNode->modified(); } +void QuickEdit::RefreshTable() +{ + if(currentNode) + Show(currentNode); +} + BrowserNode *QuickEdit::GetCurrentNode() { QModelIndex current = ui->tvEditor->currentIndex(); @@ -450,6 +462,7 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) connect(ui->pbDownOneLevel, SIGNAL(clicked()), this, SLOT(OnIncreaseOpenLevels())); connect(ui->pbAddAttribute, SIGNAL(clicked()), this, SLOT(OnAddParameter())); connect(ui->pbAddOperation, SIGNAL(clicked()), this, SLOT(OnAddOperation())); + 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))); @@ -490,9 +503,17 @@ void QuickEdit::Show(BrowserNode * node) 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(); - this->showMaximized(); + if(!size.isValid()) + this->showMaximized(); + else + { + this->resize(size); + this->show(); + } + } @@ -510,6 +531,10 @@ void QuickEdit::closeEvent(QCloseEvent *) 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(""); localNodeHolder.clear(); } @@ -834,6 +859,75 @@ void QuickEdit::TypeDelegateSetup() } +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(editor); + box->setCurrentText(value); + }; + delegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) + { + QComboBox * box = static_cast(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(editor); + box->setCurrentText(value); + }; + delegate->dataSetter = [](QWidget * editor,QAbstractItemModel* model, const QModelIndex &index) + { + QComboBox * box = static_cast(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); diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 719f8ddc0..4f59378da 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -75,6 +75,7 @@ class QuickEdit : public QWidget QStringList columns; //QModelIndex current; + BrowserNode* currentNode = nullptr; void SetupTreeModel(TreeModel*& , QTreeView*, QSharedPointer&, @@ -98,12 +99,16 @@ class QuickEdit : public QWidget void TypeDelegateSetup(); void DirectionDelegateSetup(); void CheckBoxDelegateSetup(); + void PrefixDelegateSetup(); + void PostfixDelegateSetup(); void SetupItemCreationFuncs(); void CheckColumnVisibility(); void AddParameter(); void AddOperation(); + void RefreshTable(); + BrowserNode* GetCurrentNode(); @@ -132,7 +137,7 @@ class QuickEdit : public QWidget void OnChangeColumnVisibility(); void OnMoveMarkedAfter(); void OnMoveMarkedBefore(); - + void OnRefreshTable(); }; #endif // QUICKEDIT_H diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 565ea0bfb..2369f11e8 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -174,6 +174,8 @@ void QuickEdit::SetupDelegates() VisibilityDelegateSetup(); TypeDelegateSetup(); DirectionDelegateSetup(); + PrefixDelegateSetup(); + PostfixDelegateSetup(); } // some really insane code from stackoverflow that allows to shorten lengthy ifs diff --git a/src/browser/BrowserAttribute.cpp b/src/browser/BrowserAttribute.cpp index ac4306716..44d2444d4 100644 --- a/src/browser/BrowserAttribute.cpp +++ b/src/browser/BrowserAttribute.cpp @@ -369,7 +369,7 @@ void BrowserAttribute::exec_menu_choice(int rank) break; case 6: - ((BrowserClass *) parent())->add_attribute(this); + ((BrowserClass *) parent())->duplicate_attribute(this); return; case 7: diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 19776d1b6..141b50b00 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1065,7 +1065,7 @@ 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 : "), UmlClass, FALSE, FALSE)) @@ -1319,10 +1319,11 @@ void BrowserClass::set_name(const char * s) } BrowserNode * BrowserClass::add_attribute(BrowserAttribute * attr, - bool enum_item) + bool enum_item, bool sameName) { QString name; - + if(attr && sameName) + name = attr->get_name(); if (enter_child_name(name, (enum_item) ? TR("enter item's name : ") : TR("enter attribute's name : "), UmlAttribute, FALSE, FALSE)) { @@ -1348,6 +1349,11 @@ BrowserNode * BrowserClass::add_attribute(BrowserAttribute * attr, return 0; } +BrowserNode *BrowserClass::duplicate_attribute(BrowserAttribute *attr, bool enum_item) +{ + return add_attribute(attr, enum_item, true); +} + BrowserNode * BrowserClass::add_extra_member(BrowserExtraMember * em) { em = (em == 0) ? BrowserExtraMember::new_one(QString(), this) @@ -1373,9 +1379,11 @@ 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)) @@ -1395,6 +1403,11 @@ BrowserNode * BrowserClass::add_operation(BrowserOperation * oper) return 0; } +BrowserNode *BrowserClass::duplicate_operation(BrowserOperation *oper) +{ + return add_operation(oper, true); +} + BrowserNode *BrowserClass::addOperation(BrowserOperation *oper) { diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index 09af6857e..8f86aea6f 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -77,9 +77,11 @@ class BrowserClass : public BrowserNode, public Labeled 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 * 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); diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index f4e9bc725..df32a47c7 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1385,7 +1385,7 @@ bool BrowserNode::enter_child_name(QString & r, const QString & msg, UmlCode typ { for (;;) { BooL ok = FALSE; - r = MyInputDialog::getText("Uml", msg, QString(), ok); + r = MyInputDialog::getText("Uml", msg, r, ok); if (ok) { if (wrong_child_name(r, type, allow_spaces, allow_empty)) @@ -1420,8 +1420,8 @@ bool BrowserNode::enter_child_name(QString & r, const QString & msg, UmlCode typ BooL ok = FALSE; r = (list.count() == 1) - ? MyInputDialog::getText("Uml", msg, QString(), ok) - : MyInputDialog::getText("Uml", msg, list, QString(), existing, ok); + ? MyInputDialog::getText("Uml", msg, QString(), ok) + : MyInputDialog::getText("Uml", msg, list, QString(), existing, ok); if (! ok) return FALSE; diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp index 3b9570c70..11ae3c4c0 100644 --- a/src/browser/BrowserOperation.cpp +++ b/src/browser/BrowserOperation.cpp @@ -706,7 +706,7 @@ void BrowserOperation::exec_menu_choice(int rank) case 1: if ((get_of == 0) && (set_of == 0)) - ((BrowserClass *) parent())->add_operation(this); + ((BrowserClass *) parent())->duplicate_operation(this); ImplBy.clear(); return; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 32ed2ca77..bcb426ced 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -2387,7 +2387,10 @@ void UmlWindow::OnPickSelectionFromItem(const QModelIndex & current, const QMode void UmlWindow::OnShowQuickEdit() { - quickEdit->OnShow(); + if(quickEdit->isVisible()) + quickEdit->close(); + else + quickEdit->OnShow(); } void UmlWindow::whats_this() const diff --git a/src/icons.qrc b/src/icons.qrc index 52bc5d948..dd57b47fe 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -12,5 +12,6 @@ icons/right.png icons/up.png icons/bullet_add.png + icons/arrow_refresh.png diff --git a/src/icons/arrow_refresh.png b/src/icons/arrow_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..edcfa3e7ed683c3701c6aa38ae8fa170dc9d4b86 GIT binary patch literal 2281 zcmVX+D$Am)N%83tW?9!0Z&Bs&Bxdh9^uT(eSH1dSMbB#KjBH|fE!)BPXHz}4H7$zM(4y? z{*DsvBpq=RezynkmH<;XfwRYe%Pn|0mBFFAI^e6-PE8Ep^-LNqbMcHguy#ciTAx0K zRaHFowaY+&P+JM7#VQWUVzr6DFTdqJ^En+NSL_T;z6KT21)}-;M1!-F+X;4Q~G zke8?6hH*-wr2iJFge5B+2-jtO|uV4Ns4f3nZbvKp_+l zt2v8PkyFU)tpq+ffmBy3zRqyB>1h}ZLz6t01rxXUF`pey>oKMWI0DQ#{(-iVbA?L&`@5d9FI&XWF%80G;W6B z=Ep?fZ)i@<;Ws%QC|;#?G`@uOzOSe_a?&`qVz@nDrPSYFLf>RR9^uSqStd(Z1RYs( zU%h_cMn3#w<6e}=8kuu2Bg_ol=e@x76X>Ti>$o%_wuRuZ<-wd!xWWPDt*DpTNH<}% zpXOSg!}~N|z0i10H%#g-PRzw|WuzVJ{(TI6t}-26Jv+pB=lePmd&PL}03tesIV9xL zEIR7B{MOmbPxHONy50K8U$|3DRAvZTl0g%_`s<0QVQjwsSM&=)0)NjrhItZOIM=># zz0QIBVvGqy!eB|8P+Vfe=Y(=VkSO1v$Mi4>_;@0MuW^|kC^4Q&tIeb~5CP>7qc(aS zyS!DnL1a^*n_z&@S+^7tsN79b-#|!hq1`&?{(P=Sfu4A<2UwdB1ZXaK4!i3@%tFL(-?DW~p+un2_^j zV(~?BG7G7`?672g7WT(N^BY#y;|L+W+H(oVZzr3G%Mz#GzG|y>+E;~Oau%}%H~(nhDw@}9$NnE5QBvGbQc|cyDGF*t$QYJ5xN;Sqeo^0=eiqv91Y?ZdR}15#|zgVe4biY8!Bgb2~QCq4f_MVMyoJm=-Wa zkDhNeGGU?_oK_AxsRb6Z`p8KH#zyokaNq90!HUgz)b~}D|54`dEuJ(^L;HRW+peea zFOvs{NBZE=A)m{wOB;bGDlEpy7vDw8cmIIWL|kvr^iD}P#CudynvTTDwb>9txe!q8 zo~UiYD}@!DU@>wQslsAr%%%xrw1?r?&9n;Q1fNyzlJu0~WToM0O6Vx7oS!;4!*q&pE)r76$!W!y z7|)W_$u&hp=d&}2zx@o(pZzUD9)^jd5Vx^cmjG(_r7cgPhJQRjRCIQ+RzMn#L|Bzy zQB6~}TQUk)_E`*Pj6Omd5;@4#zX1Pj#*3UjEN%XV$MC`Q7_RiUWwtLVtUSr9wU6NE z_p{^_Fzz9?TGW5!(Puj$&nsR~&1~}|6K6$$QKn8mj|U>>0L1 zf|(ZW9)DUkl&;3{`p5AAixO-uWnB6Nsr&39be>4dCDNQ_yCA{hhC#OS9q-^hs@{{F z3E%aP$x?NNgH*z-q47U;`*5Ig8|s$T!YnB&eVx-g-w{cx7N1rqu>@n_BXk6Z@heU@ z-|KJLQVs||$x{foS-HWpBVxSYND*l&s=$h(l`6i1iZDOI&XCQ9p0Z@R^oh@Nba2!f zWmxKoBv8`0NAKnUMH6{OddeA#3@1EB10tn`ih)w{#LSjF$sD(kc*6OB(Ie0eu;swC zG3588v>k?O#-#RT9r%APgMN?(zR+;~OI_l?{{$ES-vFmPO6XJ{00000NkvXXu0mjf D1q?!{ literal 0 HcmV?d00001 diff --git a/src/ui/quickedit.ui b/src/ui/quickedit.ui index a8d6f7e5b..2c6fd5a2f 100644 --- a/src/ui/quickedit.ui +++ b/src/ui/quickedit.ui @@ -14,8 +14,19 @@ Form - + + + + + + + + + :/root/icons/arrow_refresh.png:/root/icons/arrow_refresh.png + + + @@ -126,6 +137,9 @@ Qt::Horizontal + + QSizePolicy::MinimumExpanding + 40 @@ -136,18 +150,7 @@ - - - - Attribute - - - - :/root/icons/bullet_add.png:/root/icons/bullet_add.png - - - - + Qt::Horizontal @@ -160,7 +163,7 @@ - + @@ -174,6 +177,17 @@ + + + + Parameter + + + + :/root/icons/bullet_add.png:/root/icons/bullet_add.png + + + From e6b06f9c42c41f0416149e1354f3c40d4153c04a Mon Sep 17 00:00:00 2001 From: zeks Date: Wed, 20 Mar 2013 20:56:15 +0400 Subject: [PATCH 064/297] import/export XMI2.1 seem to be working --- README.md | 4 +- bin/settings.ini | 2 +- changelog.txt | 3 + genplugouts/Xmi2Generator/Dialog.cpp | 2 +- genplugouts/Xmi2Generator/FileOut.cpp | 126 +++++------------- genplugouts/Xmi2Generator/FileOut.h | 10 +- genplugouts/Xmi2Generator/UmlActivity.cpp | 8 +- genplugouts/Xmi2Generator/UmlActivity.h | 4 +- .../Xmi2Generator/UmlActivityAction.cpp | 2 +- genplugouts/Xmi2Generator/UmlActivityItem.h | 2 +- genplugouts/Xmi2Generator/UmlAttribute.cpp | 6 +- genplugouts/Xmi2Generator/UmlBaseItem.cpp | 2 +- genplugouts/Xmi2Generator/UmlBaseItem.h | 2 +- genplugouts/Xmi2Generator/UmlBaseMessage.h | 2 +- genplugouts/Xmi2Generator/UmlBaseSubject.h | 2 +- genplugouts/Xmi2Generator/UmlBaseTypeSpec.h | 2 +- genplugouts/Xmi2Generator/UmlClass.cpp | 2 +- genplugouts/Xmi2Generator/UmlClassMember.cpp | 15 ++- genplugouts/Xmi2Generator/UmlClassMember.h | 2 +- .../Xmi2Generator/UmlCollaborationMessage.cpp | 2 +- genplugouts/Xmi2Generator/UmlFragment.cpp | 2 +- .../Xmi2Generator/UmlFragmentCompartment.cpp | 2 +- genplugouts/Xmi2Generator/UmlItem.cpp | 10 +- genplugouts/Xmi2Generator/UmlItem.h | 2 +- genplugouts/Xmi2Generator/UmlNcRelation.cpp | 4 +- genplugouts/Xmi2Generator/UmlOperation.cpp | 48 +++---- genplugouts/Xmi2Generator/UmlPackage.cpp | 12 +- genplugouts/Xmi2Generator/UmlRelation.cpp | 6 +- genplugouts/Xmi2Generator/UmlSettings.h | 2 +- genplugouts/Xmi2Generator/UmlState.cpp | 4 +- genplugouts/Xmi2Generator/UmlState.h | 4 +- genplugouts/Xmi2Generator/Xmi2Generator.pro | 5 +- genplugouts/plugouts.pro | 2 +- genplugouts/xmi2import/Association.cpp | 8 +- genplugouts/xmi2import/Association.h | 2 +- genplugouts/xmi2import/Binding.cpp | 2 +- genplugouts/xmi2import/ClassInstance.cpp | 4 +- genplugouts/xmi2import/FileIn.cpp | 14 +- genplugouts/xmi2import/FileIn.h | 4 +- .../UmlAccessVariableValueAction.cpp | 4 +- genplugouts/xmi2import/UmlActivity.cpp | 4 +- .../xmi2import/UmlActivityActionClasses.cpp | 16 +-- genplugouts/xmi2import/UmlActivityObject.cpp | 4 +- .../xmi2import/UmlActivityPartition.cpp | 4 +- genplugouts/xmi2import/UmlArtifact.cpp | 2 +- genplugouts/xmi2import/UmlBaseOperation.cpp | 13 +- genplugouts/xmi2import/UmlBaseOperation.h | 7 +- genplugouts/xmi2import/UmlClass.cpp | 8 +- genplugouts/xmi2import/UmlClass.h | 2 +- genplugouts/xmi2import/UmlComponent.cpp | 6 +- .../xmi2import/UmlEntryPointPseudoState.cpp | 2 +- .../xmi2import/UmlExitPointPseudoState.cpp | 2 +- genplugouts/xmi2import/UmlFlow.cpp | 4 +- genplugouts/xmi2import/UmlItem.cpp | 32 ++--- genplugouts/xmi2import/UmlItem.h | 10 +- genplugouts/xmi2import/UmlOperation.cpp | 3 +- genplugouts/xmi2import/UmlPackage.cpp | 6 +- genplugouts/xmi2import/UmlState.cpp | 6 +- genplugouts/xmi2import/UmlTransition.cpp | 4 +- genplugouts/xmi2import/UmlUseCase.cpp | 4 +- genplugouts/xmi2import/xmi2import.pro | 4 +- src/CustomWidgets/EdgeMenuToolBar.cpp | 1 + src/CustomWidgets/quickedit.cpp | 4 +- src/CustomWidgets/quickedit.h | 16 ++- .../quickeditcontrollersetup.cpp | 2 +- src/data/OperationData.cpp | 2 +- src/misc/mystr.h | 6 + 67 files changed, 243 insertions(+), 272 deletions(-) diff --git a/README.md b/README.md index 089e15749..e0dcc54ac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -DoUML version 1.0b4 +Built from tag: 1.0b6 + +DoUML version 1.0b6 ================== *** IMPORTANT NOTICE *** diff --git a/bin/settings.ini b/bin/settings.ini index 02a10e8e0..86e0e3a26 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -7,7 +7,7 @@ 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" +Tools="Import Rose,Uml projection,C++ state machine,Generate XMI 1.2,Generate .pro" [headers] quickedit=@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6g\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\0›\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0) diff --git a/changelog.txt b/changelog.txt index 9228db3b7..f000ee5fa 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +v1.0b6 + 1. Import/Export XMI2.1 are working now. Pls test for any possible bugs before fully embracing them. + v1.0b5 1. Duplicating class, operation and attribute produces its name in the name request edit. 2. Vastly expanded functionality of Quickedit window. diff --git a/genplugouts/Xmi2Generator/Dialog.cpp b/genplugouts/Xmi2Generator/Dialog.cpp index e3d541b9b..757d50271 100644 --- a/genplugouts/Xmi2Generator/Dialog.cpp +++ b/genplugouts/Xmi2Generator/Dialog.cpp @@ -67,7 +67,7 @@ Dialog::Dialog(WrapperStr & path, WrapperStr & encoding, WrapperStr & nomodel, W if (_encoding.isEmpty()) _encoding = "UTF-8"; - encoding_cb->insertItem(QString(_encoding)); + encoding_cb->insertItem(_encoding); if (!charset.isEmpty() && (_encoding != (const char *) charset)) encoding_cb->insertItem(charset); diff --git a/genplugouts/Xmi2Generator/FileOut.cpp b/genplugouts/Xmi2Generator/FileOut.cpp index 64585fd86..af1d6fa6a 100644 --- a/genplugouts/Xmi2Generator/FileOut.cpp +++ b/genplugouts/Xmi2Generator/FileOut.cpp @@ -4,6 +4,7 @@ #include #include +#include //Added by qt3to4: #include "misc/mystr.h" FileOut::FileOut(QFile * fp, bool lf, bool utf8) : Q3TextStream(fp), _lf(lf), _indent(0) @@ -48,11 +49,11 @@ void FileOut::idref(WrapperStr s, UmlItem * x) { Q3TextStream keyst(&keys, QIODevice::WriteOnly); - keyst << ((void *) x) << "_" << s; + keyst << ((void *) x) << "_" << s.operator QString(); } - QMap::ConstIterator it = - _modifiedtypes.find((const char *) keys); + QMap::ConstIterator it = + _modifiedtypes.find((const char *) keys); if (it == _modifiedtypes.end()) it = _modifiedtypes.insert((const char *) keys, _modifiedtypes.count()); @@ -81,7 +82,7 @@ void FileOut::idref_datatype(const WrapperStr & t) if (t.isEmpty()) return; - QMap::ConstIterator it = _datatypes.find(t); + QMap::ConstIterator it = _datatypes.find(t); if (it == _datatypes.end()) it = _datatypes.insert(t, _datatypes.count()); @@ -112,25 +113,25 @@ void FileOut::ref_only(UmlItem * x, const char * pfix) void FileOut::define_datatypes(bool uml_20, bool primitive_type, bool gen_extension) { const char * pfix = (primitive_type) - ? ((uml_20) ? "::ConstIterator it; + QMap::ConstIterator it; for (it = _datatypes.begin(); it != _datatypes.end(); ++it) { indent(); (*this) << pfix << " xmi:id=\"BOUML_datatype_" - << it.data() << "\" name=\""; + << it.data() << "\" name=\""; quote((const char *)it.key()); //[jasa] ambiguous call (*this) << "\"/>\n"; } const char * postfix = - (uml_20) ? "\n" : "\n"; + (uml_20) ? "\n" : "\n"; for (it = _modifiedtypes.begin(); it != _modifiedtypes.end(); @@ -140,7 +141,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.data() << "\" name = \""; quote((const char *)k.mid(index + 1)); (*this) << '"'; @@ -149,7 +150,7 @@ void FileOut::define_datatypes(bool uml_20, bool primitive_type, bool gen_extens indent(); (*this) << "\t\n"; indent(); - (*this) << "\t\t\n"; + (*this) << "\t\t\n"; indent(); (*this) << "\t\n"; indent(); @@ -160,90 +161,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) << "<"; - break; - - case '>': - (*this) << ">"; - break; - - case '"': - (*this) << """; - break; - - case '&': - (*this) << "&"; - break; + int i = 0; + static std::unordered_map > converter = { + {"<", [&](){ (*this) << "<";}}, + {">", [&](){ (*this) << ">";}}, + {"\"", [&](){ (*this) << """;}}, + {"&", [&](){ (*this) << "&";}}, + {"\n", [&](){if (_lf) (*this) << s.mid(i, 1); else (*this) << " ";}}, + {"\r", [&](){if (_lf) (*this) << s.mid(i, 1); else (*this) << " ";}}, +}; - case '\n': - if (_lf)(*this) << *s; - else (*this) << " "; - - break; - - case '\r': - if (_lf)(*this) << *s; - else (*this) << " "; - - break; - - default: - (*this) << *s; - break; - } - - s += 1; - } -} - -void FileOut::quote(char c) -{ - switch (c) { - case '<': - (*this) << "<"; - break; - - case '>': - (*this) << ">"; - break; - - case '"': - (*this) << """; - break; - - case '&': - (*this) << "&"; - break; - - case '\n': - if (_lf)(*this) << c; - else (*this) << " "; - - break; - - case '\r': - if (_lf)(*this) << c; - else (*this) << " "; - - 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..afa1b125c 100644 --- a/genplugouts/Xmi2Generator/FileOut.h +++ b/genplugouts/Xmi2Generator/FileOut.h @@ -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 _datatypes; + QMap _datatypes; - QMap _modifiedtypes; + QMap _modifiedtypes; }; diff --git a/genplugouts/Xmi2Generator/UmlActivity.cpp b/genplugouts/Xmi2Generator/UmlActivity.cpp index dce127b31..0433666f3 100644 --- a/genplugouts/Xmi2Generator/UmlActivity.cpp +++ b/genplugouts/Xmi2Generator/UmlActivity.cpp @@ -92,7 +92,7 @@ void UmlActivity::write(FileOut & out) write_flows(out); - QMap::ConstIterator ito; + QMap::ConstIterator ito; for (ito = _opaque_behavior.begin(); ito != _opaque_behavior.end(); ++ito) { out.indent(); @@ -111,7 +111,7 @@ void UmlActivity::write(FileOut & out) out.indent(); out << "\n"; - QMap::ConstIterator ite; + QMap::ConstIterator ite; for (ite = _opaque_expression.begin(); ite != _opaque_expression.end(); ++ite) { out.indent(); @@ -164,7 +164,7 @@ void UmlActivity::write_condition(FileOut & out, WrapperStr cond, bool pre) UmlItem * UmlActivity::add_opaque_behavior(WrapperStr beh, UmlItem * who, const char * k) { - QMap::Iterator iter = _opaque_behavior.find(beh); + QMap::Iterator iter = _opaque_behavior.find(beh); if (iter == _opaque_behavior.end()) { _opaque_behavior.insert(beh, Opaque(who, k)); @@ -176,7 +176,7 @@ UmlItem * UmlActivity::add_opaque_behavior(WrapperStr beh, UmlItem * who, const UmlItem * UmlActivity::add_opaque_expression(WrapperStr val, UmlItem * who) { - QMap::Iterator iter = _opaque_expression.find(val); + QMap::Iterator iter = _opaque_expression.find(val); if (iter == _opaque_expression.end()) { _opaque_expression.insert(val, who); 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 _opaque_behavior; + QMap _opaque_behavior; - QMap _opaque_expression; + QMap _opaque_expression; }; diff --git a/genplugouts/Xmi2Generator/UmlActivityAction.cpp b/genplugouts/Xmi2Generator/UmlActivityAction.cpp index 34d408750..f7b73cb56 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) ? " diff --git a/genplugouts/Xmi2Generator/UmlBaseSubject.h b/genplugouts/Xmi2Generator/UmlBaseSubject.h index e34a953be..48fab66f7 100644 --- a/genplugouts/Xmi2Generator/UmlBaseSubject.h +++ b/genplugouts/Xmi2Generator/UmlBaseSubject.h @@ -1,7 +1,7 @@ #ifndef _UMLBASESUBJECT_H #define _UMLBASESUBJECT_H - +#include "../src/misc/mystr.h" #include diff --git a/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h b/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h index aecc28abe..ae6b6d17f 100644 --- a/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h +++ b/genplugouts/Xmi2Generator/UmlBaseTypeSpec.h @@ -2,7 +2,7 @@ #define _UMLBASETYPESPEC_H - +#include "../src/misc/mystr.h" class UmlClass; diff --git a/genplugouts/Xmi2Generator/UmlClass.cpp b/genplugouts/Xmi2Generator/UmlClass.cpp index 198bb1ff5..c2fcfbb0e 100644 --- a/genplugouts/Xmi2Generator/UmlClass.cpp +++ b/genplugouts/Xmi2Generator/UmlClass.cpp @@ -114,7 +114,7 @@ void UmlClass::write(FileOut & out) out.indent(); out << "\n"; + out << " location=\"" << path.operator QString() << "\"/>\n"; } } diff --git a/genplugouts/Xmi2Generator/UmlClassMember.cpp b/genplugouts/Xmi2Generator/UmlClassMember.cpp index a2cfe3710..1f14553e0 100644 --- a/genplugouts/Xmi2Generator/UmlClassMember.cpp +++ b/genplugouts/Xmi2Generator/UmlClassMember.cpp @@ -4,6 +4,7 @@ #include "UmlTypeSpec.h" #include "UmlClass.h" +#include //Added by qt3to4: #include "misc/mystr.h" void UmlClassMember::write_scope(FileOut & out) @@ -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) @@ -153,7 +156,7 @@ void UmlClassMember::write_type(FileOut & out, const UmlTypeSpec & t, WrapperStr 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/UmlCollaborationMessage.cpp b/genplugouts/Xmi2Generator/UmlCollaborationMessage.cpp index f6df8e588..482abcd7b 100644 --- a/genplugouts/Xmi2Generator/UmlCollaborationMessage.cpp +++ b/genplugouts/Xmi2Generator/UmlCollaborationMessage.cpp @@ -2,7 +2,7 @@ #include "UmlCollaborationMessage.h" #include "FileOut.h" #include "UmlItem.h" - +#include "../src/misc/mystr.h" #include "UmlPackage.h" #include "UmlOperation.h" #include "UmlClassInstanceReference.h" diff --git a/genplugouts/Xmi2Generator/UmlFragment.cpp b/genplugouts/Xmi2Generator/UmlFragment.cpp index a64e3e840..702c60096 100644 --- a/genplugouts/Xmi2Generator/UmlFragment.cpp +++ b/genplugouts/Xmi2Generator/UmlFragment.cpp @@ -54,7 +54,7 @@ void UmlFragment::write(FileOut & out, UmlItem * diagram, Q3PtrList\n"; + out << " interactionOperator=\"" << oper.operator QString() << "\">\n"; out.indent(+1); } diff --git a/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp b/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp index 755cff3de..000dd9c3a 100644 --- a/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp +++ b/genplugouts/Xmi2Generator/UmlFragmentCompartment.cpp @@ -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") { diff --git a/genplugouts/Xmi2Generator/UmlItem.cpp b/genplugouts/Xmi2Generator/UmlItem.cpp index 5ab03d603..a40058a81 100644 --- a/genplugouts/Xmi2Generator/UmlItem.cpp +++ b/genplugouts/Xmi2Generator/UmlItem.cpp @@ -84,7 +84,7 @@ void UmlItem::write_description_properties(FileOut & out) } } - if (ste.contains(':') == 1) + if (ste.operator QString().contains(':') == 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 << "\n"; + out << " value=\"" << min.operator QString() << "\"/>\n"; out.indent(); out << "\n"; + out << " value=\"" << max.operator QString() << "\"/>\n"; } } @@ -192,7 +192,7 @@ void UmlItem::write_default_value(FileOut & out, WrapperStr v, UmlItem * who, in void UmlItem::write_stereotyped(FileOut & out) { - QMap >::Iterator it; + QMap >::Iterator it; for (it = _stereotypes.begin(); it != _stereotypes.end(); ++it) { const char * st = it.key(); @@ -269,5 +269,5 @@ bool UmlItem::_gen_extension; bool UmlItem::_gen_eclipse; -QMap > UmlItem::_stereotypes; +QMap > UmlItem::_stereotypes; diff --git a/genplugouts/Xmi2Generator/UmlItem.h b/genplugouts/Xmi2Generator/UmlItem.h index eb68e5a42..aba38c9d5 100644 --- a/genplugouts/Xmi2Generator/UmlItem.h +++ b/genplugouts/Xmi2Generator/UmlItem.h @@ -84,7 +84,7 @@ class UmlItem : public UmlBaseItem static bool _gen_eclipse; - static QMap > _stereotypes; + static QMap > _stereotypes; }; 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 << "\n"; + out << "\n"; } else write(out, TRUE); diff --git a/genplugouts/Xmi2Generator/UmlOperation.cpp b/genplugouts/Xmi2Generator/UmlOperation.cpp index 418676382..80bdeba95 100644 --- a/genplugouts/Xmi2Generator/UmlOperation.cpp +++ b/genplugouts/Xmi2Generator/UmlOperation.cpp @@ -3,7 +3,7 @@ #include "FileOut.h" #include - +#include "../src/misc/mystr.h" #include "UmlClass.h" #include "CppSettings.h" #include "JavaSettings.h" @@ -11,6 +11,7 @@ //Added by qt3to4: #include "misc/mystr.h" #include +#include void UmlOperation::write(FileOut & out) { WrapperStr decl; @@ -216,7 +217,7 @@ void UmlOperation::write_uml_params(FileOut & out) for (it = p.begin(); it != p.end(); ++it) { out.indent(); - out << " +bool operator *(const T0& lhs, const std::array& rhs) { + return std::find(begin(rhs), end(rhs), lhs) != end(rhs); +} + +template std::array 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; @@ -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; } diff --git a/genplugouts/Xmi2Generator/UmlPackage.cpp b/genplugouts/Xmi2Generator/UmlPackage.cpp index e9ff454fa..b49d28977 100644 --- a/genplugouts/Xmi2Generator/UmlPackage.cpp +++ b/genplugouts/Xmi2Generator/UmlPackage.cpp @@ -175,7 +175,7 @@ void UmlPackage::xmi(int argc, char ** argv) search_profiles(profiles); out << "\ -\n\ + \n\ \n"; + << name().operator QString() << "\">\n"; out.indent(+2); } @@ -279,15 +279,15 @@ void UmlPackage::write(FileOut & out) out << "\n"; + out << " alias=\"" << mcr.mid(index + 1).operator QString() << "\">\n"; else out << ">\n"; out.indent(); - out << "\t\n"; + out << "\t\n"; out.indent(); out << "\n"; } @@ -298,7 +298,7 @@ void UmlPackage::write(FileOut & out) out.id_prefix(this, "MMR_"); out << ">\n"; out.indent(); - out << "\t\n"; + out << "\t\n"; out.indent(); out << "\n"; } 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 << "name() << '"'; + out << " href=\"" << s.operator QString() << '#' << base->name().operator QString() << '"'; } else out.idref(roleType()); diff --git a/genplugouts/Xmi2Generator/UmlSettings.h b/genplugouts/Xmi2Generator/UmlSettings.h index 1eaba822e..157b162ac 100644 --- a/genplugouts/Xmi2Generator/UmlSettings.h +++ b/genplugouts/Xmi2Generator/UmlSettings.h @@ -5,7 +5,7 @@ #include "aLanguage.h" #include - +#include "../src/misc/mystr.h" struct UmlBuiltin; struct UmlStereotype; diff --git a/genplugouts/Xmi2Generator/UmlState.cpp b/genplugouts/Xmi2Generator/UmlState.cpp index d878e35af..9539063d4 100644 --- a/genplugouts/Xmi2Generator/UmlState.cpp +++ b/genplugouts/Xmi2Generator/UmlState.cpp @@ -199,10 +199,10 @@ void UmlState::add_incoming_trans(UmlTransition * tr) UmlState * UmlState::find(WrapperStr s) { - QMap::Iterator iter = _all.find(s); + QMap::Iterator iter = _all.find(s); return (iter == _all.end()) ? 0 : *iter; } -QMap UmlState::_all; +QMap UmlState::_all; diff --git a/genplugouts/Xmi2Generator/UmlState.h b/genplugouts/Xmi2Generator/UmlState.h index 18812f95f..4bea42518 100644 --- a/genplugouts/Xmi2Generator/UmlState.h +++ b/genplugouts/Xmi2Generator/UmlState.h @@ -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.replace(s.operator QString(), this); } virtual void write(FileOut & out); @@ -43,7 +43,7 @@ class UmlState : public UmlBaseState, public UmlStateItem Q3PtrList _trans; - static QMap _all; + static QMap _all; }; diff --git a/genplugouts/Xmi2Generator/Xmi2Generator.pro b/genplugouts/Xmi2Generator/Xmi2Generator.pro index d5187f609..7a1f5a7e5 100644 --- a/genplugouts/Xmi2Generator/Xmi2Generator.pro +++ b/genplugouts/Xmi2Generator/Xmi2Generator.pro @@ -2,6 +2,8 @@ TEMPLATE = app TARGET = gxmi2 CONFIG += debug warn_on qt DEFINES = WITHCPP WITHJAVA WITHIDL WITHPYTHON WITHPHP +QMAKE_CXXFLAGS += -std=gnu++11 +PRECOMPILED_HEADER += ../../src/misc/mystr.h HEADERS = ./UmlBaseClassDiagram.h \ ./UmlBaseDeepHistoryPseudoState.h \ ./FlowContainer.h \ @@ -410,7 +412,8 @@ SOURCES = ./UmlBaseClassDiagram.cpp \ ./UmlStateDiagram.cpp \ ./UmlBaseNcRelation.cpp \ ./UmlBaseJunctionPseudoState.cpp \ - ./UmlClassMember.cpp + ./UmlClassMember.cpp \ + ../../src/misc/mystr.cpp #The following line was inserted by qt3to4 QT += network qt3support diff --git a/genplugouts/plugouts.pro b/genplugouts/plugouts.pro index 0bf5b348a..94a496694 100644 --- a/genplugouts/plugouts.pro +++ b/genplugouts/plugouts.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += BrowserSort CppUtilities Deploy FileControl GlobalChange HtmlDoc UseCaseWizard +SUBDIRS += BrowserSort CppUtilities Deploy FileControl GlobalChange HtmlDoc UseCaseWizard Xmi2Generator xmi2import CODECFORTR = UTF-8 CODECFORSRC = UTF-8 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::Iterator it = All.find(id); + QMap::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::Iterator it; + QMap::Iterator it; for (it = All.begin(); it != All.end(); ++it) (*it).solve(it.key()); @@ -139,7 +139,7 @@ void Association::solveThem() All.clear(); } -QMap Association::All; +QMap 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::Iterator it; + QMap::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 All; + static QMap All; bool is_class_association; diff --git a/genplugouts/xmi2import/Binding.cpp b/genplugouts/xmi2import/Binding.cpp index 60db03d5b..135570b98 100644 --- a/genplugouts/xmi2import/Binding.cpp +++ b/genplugouts/xmi2import/Binding.cpp @@ -98,7 +98,7 @@ void Binding::solveThem() while (! All.isEmpty()) { Binding * b = All.take(0); - QMap::Iterator it = UmlItem::All.find(b->boundId); + QMap::Iterator it = UmlItem::All.find(b->boundId); UmlClass * tmpl = UmlClass::signature(b->signatureId); if (it == UmlItem::All.end()) { diff --git a/genplugouts/xmi2import/ClassInstance.cpp b/genplugouts/xmi2import/ClassInstance.cpp index ef69098cc..102edd65a 100644 --- a/genplugouts/xmi2import/ClassInstance.cpp +++ b/genplugouts/xmi2import/ClassInstance.cpp @@ -65,7 +65,7 @@ void ClassInstance::solveThem() Q3PtrList insts; for (cli = All.first(); cli != 0; cli = All.next()) { - QMap::Iterator it; + QMap::Iterator it; it = UmlItem::All.find(cli->classifierId); @@ -92,7 +92,7 @@ void ClassInstance::solveThem() // set attribute ans relation values while (! All.isEmpty()) { - QMap::Iterator it; + QMap::Iterator it; cli = All.take(0); diff --git a/genplugouts/xmi2import/FileIn.cpp b/genplugouts/xmi2import/FileIn.cpp index 6b49343ef..e285206e7 100644 --- a/genplugouts/xmi2import/FileIn.cpp +++ b/genplugouts/xmi2import/FileIn.cpp @@ -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()); @@ -244,7 +244,7 @@ void FileIn::bypass(Token & tk) WrapperStr s = tk.xmiType(); if (s.isEmpty()) { - QString k = QString(tk.what()); + QString k = tk.what(); if (bypassed[k] == 0) { warning("bypass <" + tk.what() + "...> (other cases not signaled)"); @@ -252,7 +252,7 @@ void FileIn::bypass(Token & tk) } } else { - QString k = QString(tk.what()) + " " + QString(s); + QString k = tk.what() + " " + s; if (bypassed[k] == 0) { warning("bypass <" + tk.what() + @@ -264,7 +264,7 @@ void FileIn::bypass(Token & tk) 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, ""); } @@ -476,7 +476,7 @@ char FileIn::read_special_char() s[index] = 0; // check on index useless - QMap::ConstIterator iter = _special_chars.find(s); + QMap::ConstIterator iter = _special_chars.find(s); if (iter == _special_chars.end()) // doesn't return diff --git a/genplugouts/xmi2import/FileIn.h b/genplugouts/xmi2import/FileIn.h index 4135dec76..82c496cbe 100644 --- a/genplugouts/xmi2import/FileIn.h +++ b/genplugouts/xmi2import/FileIn.h @@ -55,7 +55,7 @@ class FileIn } static bool isBypassedId(WrapperStr id) { - return BypassedIds[QString(id)] != 0; + return BypassedIds[id] != 0; } @@ -72,7 +72,7 @@ class FileIn char * _buffer; - QMap _special_chars; + QMap _special_chars; static Q3Dict BypassedIds; 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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::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..571cb630e 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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(spec); + QMap::Iterator it = All.find(spec); if (it == All.end()) Unresolved::addRef(a, spec); 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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(s); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(s); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(s); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::Iterator it = All.find(idref); if (it == All.end()) { if (!FileIn::isBypassedId(idref)) diff --git a/genplugouts/xmi2import/UmlBaseOperation.cpp b/genplugouts/xmi2import/UmlBaseOperation.cpp index aba86ce60..53b9f535b 100644 --- a/genplugouts/xmi2import/UmlBaseOperation.cpp +++ b/genplugouts/xmi2import/UmlBaseOperation.cpp @@ -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; } @@ -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; } diff --git a/genplugouts/xmi2import/UmlBaseOperation.h b/genplugouts/xmi2import/UmlBaseOperation.h index f9065dd8b..3a693793c 100644 --- a/genplugouts/xmi2import/UmlBaseOperation.h +++ b/genplugouts/xmi2import/UmlBaseOperation.h @@ -5,7 +5,8 @@ #include "UmlClassMember.h" #include "anItemKind.h" #include "UmlTypeSpec.h" -#include +//#include +#include #include @@ -483,9 +484,9 @@ class UmlBaseOperation : public UmlClassMember UmlTypeSpec _return_type; - Q3ValueList _params; + QList _params; - Q3ValueList _exceptions; + QList _exceptions; #ifdef WITHCPP WrapperStr _cpp_def; diff --git a/genplugouts/xmi2import/UmlClass.cpp b/genplugouts/xmi2import/UmlClass.cpp index 09f68a532..f86920192 100644 --- a/genplugouts/xmi2import/UmlClass.cpp +++ b/genplugouts/xmi2import/UmlClass.cpp @@ -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::Iterator it = All.find(idref); + QMap::Iterator it = All.find(idref); if (it != All.end()) { static const struct { @@ -288,7 +288,7 @@ void UmlClass::solveGeneralizationDependencyRealization(int context, WrapperStr UmlClass * UmlClass::signature(WrapperStr id) { - QMap::Iterator iter = signatures.find(id); + QMap::Iterator iter = signatures.find(id); return (iter == signatures.end()) ? 0 : *iter; } @@ -297,7 +297,7 @@ int UmlClass::formalRank(WrapperStr id) { int r = formalsId.findIndex(id); - if ((r == -1) && !FileIn::isBypassedId(r)) + if ((r == -1) && !FileIn::isBypassedId(QString::number(r))) UmlCom::trace("unknown template formal reference '" + id + "'
"); return r; @@ -575,5 +575,5 @@ int UmlClass::NumberOf; int UmlClass::NumberOfStereotype; //associate the class owning the template signature with the signature id -QMap UmlClass::signatures; +QMap UmlClass::signatures; diff --git a/genplugouts/xmi2import/UmlClass.h b/genplugouts/xmi2import/UmlClass.h index 4a8a6f222..f499164b8 100644 --- a/genplugouts/xmi2import/UmlClass.h +++ b/genplugouts/xmi2import/UmlClass.h @@ -93,7 +93,7 @@ class UmlClass : public UmlBaseClass Q3ValueList formalsId; //associate the class owning the template signature with the signature id - static QMap signatures; + static QMap signatures; }; diff --git a/genplugouts/xmi2import/UmlComponent.cpp b/genplugouts/xmi2import/UmlComponent.cpp index 2f33ac486..7b4712441 100644 --- a/genplugouts/xmi2import/UmlComponent.cpp +++ b/genplugouts/xmi2import/UmlComponent.cpp @@ -57,7 +57,7 @@ void UmlComponent::manageInterface(Token & token, FileIn & in) { WrapperStr idref = token.valueOf("supplier"); - QMap::Iterator it = All.find(idref); + QMap::Iterator it = All.find(idref); int c = ((const char *) token.what())[0]; if (it != All.end()) { @@ -102,7 +102,7 @@ UmlItem * UmlComponent::container(anItemKind kind, Token & token, FileIn & in) void UmlComponent::solve(int context, WrapperStr idref) { - QMap::Iterator it = All.find(idref); + QMap::Iterator it = All.find(idref); if (it != All.end()) { if ((*it)->kind() == aClass) { @@ -147,7 +147,7 @@ void UmlComponent::generalizeDependRealize(UmlItem * target, FileIn & in, int co void UmlComponent::solveGeneralizationDependencyRealization(int context, WrapperStr idref, WrapperStr label, WrapperStr constraint) { - QMap::Iterator it; + QMap::Iterator it; if ((context == 3) && ((it = All.find(idref)) != All.end()) && 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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(idref); + QMap::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..3ce0eec44 100644 --- a/genplugouts/xmi2import/UmlFlow.cpp +++ b/genplugouts/xmi2import/UmlFlow.cpp @@ -27,8 +27,8 @@ void UmlFlow::solveThem() for (iter = All.begin(); iter != All.end(); ++iter) { Flow & flow = *iter; - QMap::Iterator isrc = UmlItem::All.find(flow.source); - QMap::Iterator itgt = UmlItem::All.find(flow.target); + QMap::Iterator isrc = UmlItem::All.find(flow.source); + QMap::Iterator itgt = UmlItem::All.find(flow.target); if ((isrc == UmlItem::All.end()) && ((isrc = Outgoings.find(flow.id)) == Outgoings.end())) { diff --git a/genplugouts/xmi2import/UmlItem.cpp b/genplugouts/xmi2import/UmlItem.cpp index 4920537ac..1833fdaeb 100644 --- a/genplugouts/xmi2import/UmlItem.cpp +++ b/genplugouts/xmi2import/UmlItem.cpp @@ -72,7 +72,7 @@ void UnresolvedRelation::solveThem() Q3ValueList::Iterator it; for (it = All.begin(); it != All.end(); ++it) { - QMap::Iterator from = UmlItem::All.find((*it).from); + QMap::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::ConstIterator iter = All.find(id); + QMap::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::Iterator it = All.find(idref); + QMap::Iterator it = All.find(idref); if (it != All.end()) { static const struct { @@ -261,7 +261,7 @@ void UmlItem::loadFromProfile() bool UmlItem::getType(WrapperStr idref, UmlTypeSpec & type) { - QMap::Iterator it = All.find(idref); + QMap::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::Iterator itp = PrimitiveTypes.find(idref); + QMap::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::ConstIterator iter = All.find(id); + QMap::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::ConstIterator from = All.find(client); - QMap::ConstIterator to = All.find(supplier); + QMap::ConstIterator from = All.find(client); + QMap::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::ConstIterator from = All.find(client); - QMap::ConstIterator to = All.find(supplier); + QMap::ConstIterator from = All.find(client); + QMap::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 UmlItem::All; +QMap UmlItem::All; -QMap UmlItem::Functions; +QMap UmlItem::Functions; -QMap UmlItem::PrimitiveTypes; +QMap UmlItem::PrimitiveTypes; -QMap UmlItem::Incomings; +QMap UmlItem::Incomings; -QMap UmlItem::Outgoings; +QMap UmlItem::Outgoings; diff --git a/genplugouts/xmi2import/UmlItem.h b/genplugouts/xmi2import/UmlItem.h index 1b95bf55a..329e8cea7 100644 --- a/genplugouts/xmi2import/UmlItem.h +++ b/genplugouts/xmi2import/UmlItem.h @@ -225,17 +225,17 @@ class UmlItem : public UmlBaseItem public: - static QMap All; + static QMap All; protected: - static QMap Functions; + static QMap Functions; - static QMap PrimitiveTypes; + static QMap PrimitiveTypes; - static QMap Incomings; + static QMap Incomings; - static QMap Outgoings; + static QMap 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..640ec9a5f 100644 --- a/genplugouts/xmi2import/UmlPackage.cpp +++ b/genplugouts/xmi2import/UmlPackage.cpp @@ -375,7 +375,7 @@ void UmlPackage::applyStereotype(FileIn & in, Token & token) while (it.current()) { WrapperStr k = it.currentKey().latin1(); - 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,7 +398,7 @@ UmlPackage * UmlPackage::importProfile(FileIn & in, WrapperStr href) if (index != -1) { WrapperStr id = href.mid(index + 1); - QMap::Iterator it = All.find(id); + QMap::Iterator it = All.find(id); if (it == All.end()) { UmlPackage * pf = getProject()->findProfile(id); @@ -469,7 +469,7 @@ void UmlPackage::packageImport(FileIn & in, Token & tk) UmlPackage * pf = 0; if (!s.isEmpty()) { - QMap::Iterator it = All.find(s); + QMap::Iterator it = All.find(s); if (it == All.end()) UnresolvedRelation::add(4, this->id(), s, "", ""); 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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(ref); + QMap::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::Iterator it = All.find(spec); + QMap::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..673ca3adf 100644 --- a/genplugouts/xmi2import/UmlTransition.cpp +++ b/genplugouts/xmi2import/UmlTransition.cpp @@ -24,8 +24,8 @@ void UmlTransition::solveThem() for (iter = All.begin(); iter != All.end(); ++iter) { Transition & transition = *iter; - QMap::Iterator isrc = UmlItem::All.find(transition.source); - QMap::Iterator itgt = UmlItem::All.find(transition.target); + QMap::Iterator isrc = UmlItem::All.find(transition.source); + QMap::Iterator itgt = UmlItem::All.find(transition.target); if ((isrc == UmlItem::All.end()) /*&& ((isrc = Outgoings.find(transition.id)) == Outgoings.end())*/) { 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::Iterator it = All.find(idref); + QMap::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::Iterator it = All.find(other); + QMap::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..5a2a2ee10 100644 --- a/genplugouts/xmi2import/xmi2import.pro +++ b/genplugouts/xmi2import/xmi2import.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = ixmi2 CONFIG += debug warn_on qt DEFINES = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON BooL=bool +PRECOMPILED_HEADER += ../../src/misc/mystr.h HEADERS = ./UmlActivityPartition.h \ ./UmlBaseNode.h \ ./UmlPackage.h \ @@ -414,7 +415,8 @@ 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 diff --git a/src/CustomWidgets/EdgeMenuToolBar.cpp b/src/CustomWidgets/EdgeMenuToolBar.cpp index 68cdcea48..3a9ce281d 100644 --- a/src/CustomWidgets/EdgeMenuToolBar.cpp +++ b/src/CustomWidgets/EdgeMenuToolBar.cpp @@ -36,6 +36,7 @@ EdgeMenuToolBar::EdgeMenuToolBar(QWidget * _parent) : QToolBar(_parent) connect(this, SIGNAL(putIntoClipboard(QString)), clipboard.getData(), SLOT(OnPutItemIntoClipboard(QString))); } + EdgeMenuToolBar::~EdgeMenuToolBar() { } diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 7a86e4fe2..4258c95db 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -7,6 +7,7 @@ #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" @@ -24,6 +25,7 @@ #include "data/OperationData.h" #include "data/RelationData.h" #include "GenericDelegate.h" +#include #include #include @@ -33,7 +35,7 @@ #include #include #include - +#include static QRect CheckBoxRect(const QStyleOptionViewItem &view_item_style_options) { QStyleOptionButton check_box_style_option; QRect check_box_rect = QApplication::style()->subElementRect( diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 4f59378da..94a4bb5a3 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -2,12 +2,8 @@ #define QUICKEDIT_H #include -#include -#include -#include -#include +#include #include -#include "Libs/L_UniversalModels/include/ItemController.h" #include "UmlEnum.h" namespace Ui { @@ -21,6 +17,16 @@ class QTreeView; class Q3ListViewItem; class GenericEventFilter; class UmlWindow; +class QMenu; +class QModelIndex; +template +class ItemController; + +template +class QSharedPointer; +template +class QHash; + class QuickEdit : public QWidget { diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 2369f11e8..0e9a80602 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -1,6 +1,6 @@ #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" diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 4c192cc29..5176a4e76 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -2288,7 +2288,7 @@ void OperationData::send_uml_def(ToolCom * com, BrowserNode * bn, unsigned n; - com->write_unsigned(nparams); + com->write_unsigned(params.count()); n = nparams; for(auto& param : params) { diff --git a/src/misc/mystr.h b/src/misc/mystr.h index 418fcdb17..e9711cea4 100644 --- a/src/misc/mystr.h +++ b/src/misc/mystr.h @@ -125,6 +125,12 @@ class WrapperStr 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); From 59b2b6c8e05679e509b51083f292d40b3a5b3bec Mon Sep 17 00:00:00 2001 From: pasgui Date: Sat, 23 Mar 2013 18:42:17 +0100 Subject: [PATCH 065/297] release 1.0 beta 6 --- .gitignore | 6 +- Makefile | 153 ++++++++++++++++++ README.md | 9 +- genplugouts/BrowserSort/BrowserSort.pro | 27 ++-- genplugouts/CppUtilities/CppUtilities.pro | 31 ++-- genplugouts/FileControl/FileControl.pro | 30 ++-- genplugouts/GlobalChange/GlobalChange.pro | 30 ++-- genplugouts/HtmlDoc/HtmlDoc.pro | 30 ++-- genplugouts/Xmi2Generator/Xmi2Generator.pro | 32 ++-- genplugouts/deploy/UmlBaseOperation.cpp | 6 +- genplugouts/deploy/deploy.pro | 30 ++-- genplugouts/xmi2import/xmi2import.pro | 32 ++-- src/CppGenerator/CppGenerator.pro | 27 ++-- src/CppGenerator/UmlOperation.cpp | 8 + src/CppGenerator/main.cpp | 4 + src/CppReverse/cppreverse.pro | 30 ++-- src/CppRoundtrip/cpproundtrip.pro | 30 ++-- src/IdlGenerator/IdlGenerator.pro | 28 ++-- src/JavaCat/javacat.pro | 30 ++-- src/JavaGenerator/JavaGenerator.pro | 28 ++-- src/JavaReverse/javareverse.pro | 27 ++-- src/JavaRoundtrip/javaroundtrip.pro | 27 ++-- .../L_UniversalModels/L_UniversalModels.pro | 24 ++- src/PhpGenerator/PhpGenerator.pro | 26 +-- src/PhpReverse/phpreverse.pro | 31 ++-- src/PythonGenerator/PythonGenerator.pro | 30 ++-- src/RoundtripBody/RoundtripBody.pro | 30 ++-- src/Tools/UmlBaseOperation.cpp | 4 + src/dialog/About.cpp | 4 +- src/dialog/EnvDialog.cpp | 6 +- src/douml.pro | 65 ++------ src/main.cpp | 28 +++- src/misc/myio.cpp | 4 + src/tool/Tool.cpp | 4 + src/tool/ToolCom.cpp | 5 +- src/tool/ToolCom.h | 6 +- 36 files changed, 613 insertions(+), 309 deletions(-) create mode 100644 Makefile diff --git a/.gitignore b/.gitignore index c8f2cce2a..f6d9ecc5c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ release object_script.* minimal.supp minimalraw.log - *moc_*.cpp* *.~* *.pro.* @@ -24,6 +23,7 @@ makefile.* Makefile.* Makefile* makefile* +!/Makefile include/Libs* .cproject .project @@ -106,3 +106,7 @@ src/ui/ui_*.h bin/douml qrc_*.cpp src/CppReverse/cpp_reverse +/bin/ +!/bin/settings.ini +src/settings_ini.h +/install/ diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..5c6b45eef --- /dev/null +++ b/Makefile @@ -0,0 +1,153 @@ +# 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 +# /x/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 + +# for packaging purpose, useless by default +ifndef DESTDIR + DESTDIR = ${PWD}/install +endif + +ifndef DEB_DESTDIR + DEB_DESTDIR = ${DESTDIR} +endif + +QMAKE=qmake + +MAKE=make + +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/PythonGenerator \ + src/RoundtripBody + +PLUGOUT_DIRS=genplugouts/BrowserSort \ + genplugouts/CppUtilities \ + genplugouts/FileControl \ + genplugouts/GlobalChange \ + genplugouts/HtmlDoc \ + genplugouts/Xmi2Generator \ + genplugouts/xmi2import + +PROGS=douml \ + browsersort \ + cpp_generator \ + cpp_reverse \ + cpp_roundtrip \ + cpp_util \ + file_control \ + ghtml \ + global_change \ + idl_generator \ + java_catalog \ + java_generator \ + java_reverse \ + java_roundtrip \ + php_generator \ + php_reverse \ + python_generator \ + roundtrip_body \ + gxmi2 \ + ixmi2 + +compile: + ( cd bin && xxd -i settings.ini ../src/settings_ini.h; ) || exit 1 + ( 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 + +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)" + for i in $(PROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)" ; done + echo "#!/bin/sh" >$(DESTDIR)$(DOUML_DIR)/douml + echo "PATH=$(DEB_DESTDIR)$(DOUML_LIB):$$"PATH >>$(DESTDIR)$(DOUML_DIR)/douml + echo "DOUML_LIB_DIR=$(DEB_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 $(DEB_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 "Comment=Free UML 2 modeler" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \ + echo "Exec=$(DEB_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;" >> "$(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 + for i in $(PROGS); do rm -f bin/$$i; done + 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 index e0dcc54ac..92b9a5f38 100644 --- a/README.md +++ b/README.md @@ -127,9 +127,16 @@ Enchancements: Compiling --------- + + * Under Linux: + * dependencies: libqt4-dev, libqt4-qt3support, libboost-dev, libfile-fcntllock-perl, vim-common, g++ (>=4.7) + * make + * make install or make install DESTDIR=[path] + + * Under Windows: + L_UniversalModels library needs to be built prior to douml compilation. It is located in src/Libs/L_UniversalModels - * Under Windows: * 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. diff --git a/genplugouts/BrowserSort/BrowserSort.pro b/genplugouts/BrowserSort/BrowserSort.pro index dc2cd75d8..fc6b96828 100644 --- a/genplugouts/BrowserSort/BrowserSort.pro +++ b/genplugouts/BrowserSort/BrowserSort.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = browsersort -CONFIG += warn_on qt +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 += ../../src HEADERS = ./UmlActivityPin.h \ ./TransitionBehavior.h \ @@ -322,15 +331,13 @@ SOURCES = ./UmlActivityPin.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 +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/browsersort + OBJECTS_DIR = $${DESTDIR}/obj_debug/browsersort } - - DESTDIR = ../../bin diff --git a/genplugouts/CppUtilities/CppUtilities.pro b/genplugouts/CppUtilities/CppUtilities.pro index b089fcc90..cd105cdf3 100644 --- a/genplugouts/CppUtilities/CppUtilities.pro +++ b/genplugouts/CppUtilities/CppUtilities.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = cpp_util -CONFIG += warn_on qt +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 = " " +} DEFINES = WITHCPP TRACE INCLUDEPATH += ../../src HEADERS = ./UmlBasePackage.h \ @@ -411,20 +420,16 @@ SOURCES = ./UmlBasePackage.cpp \ #The following line was inserted by qt3to4 QT += network qt3support - -Release{ - - - MOC_DIR = bin/douml/MOC_release - OBJECTS_DIR = bin/douml/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/cpp_util + OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_util } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/genplugouts/FileControl/FileControl.pro b/genplugouts/FileControl/FileControl.pro index 9be6a813b..a6137ec3c 100644 --- a/genplugouts/FileControl/FileControl.pro +++ b/genplugouts/FileControl/FileControl.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = file_control -CONFIG += warn_on qt +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 = " " +} DEFINES = BooL=bool HEADERS = ./aVisibility.h \ ./UmlBaseExtraClassMember.h \ @@ -232,19 +241,16 @@ SOURCES = ./aVisibility.cpp \ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/fcontrol/MOC_release - OBJECTS_DIR = bin/douml/fcontrol/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/file_control + OBJECTS_DIR = $${DESTDIR}/obj_debug/file_control } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/genplugouts/GlobalChange/GlobalChange.pro b/genplugouts/GlobalChange/GlobalChange.pro index 965c3e32d..3b7f3b548 100644 --- a/genplugouts/GlobalChange/GlobalChange.pro +++ b/genplugouts/GlobalChange/GlobalChange.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = global_change -CONFIG += warn_on qt +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 = " " +} DEFINES = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON HEADERS = ./UmlBaseUseCaseAssociation.h \ ./UmlActivityDiagram.h \ @@ -404,19 +413,16 @@ SOURCES = ./UmlBaseUseCaseAssociation.cpp \ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/global_change/MOC_release - OBJECTS_DIR = bin/douml/global_change/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/global_change + OBJECTS_DIR = $${DESTDIR}/obj_debug/global_change } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/genplugouts/HtmlDoc/HtmlDoc.pro b/genplugouts/HtmlDoc/HtmlDoc.pro index 209368d9e..b5131e6e4 100644 --- a/genplugouts/HtmlDoc/HtmlDoc.pro +++ b/genplugouts/HtmlDoc/HtmlDoc.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = ghtml -CONFIG += warn_on qt +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 = " " +} DEFINES = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON HEADERS = ./UmlBaseRelation.h \ ./UmlFormalParameter.h \ @@ -409,19 +418,16 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/html/MOC_release - OBJECTS_DIR = bin/douml/html/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/ghtml + OBJECTS_DIR = $${DESTDIR}/obj_debug/ghtml } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/genplugouts/Xmi2Generator/Xmi2Generator.pro b/genplugouts/Xmi2Generator/Xmi2Generator.pro index 7a1f5a7e5..acb99337f 100644 --- a/genplugouts/Xmi2Generator/Xmi2Generator.pro +++ b/genplugouts/Xmi2Generator/Xmi2Generator.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = gxmi2 -CONFIG += debug warn_on qt +CONFIG(Debug, Debug|Release) { + CONFIG -= Debug Release + CONFIG += qt warn_on Debug precompile_header + QMAKE_POST_LINK = " " +} +CONFIG(Release, Debug|Release) { + CONFIG -= Debug Release + CONFIG += qt Release precompile_header + QMAKE_POST_LINK = " " +} DEFINES = WITHCPP WITHJAVA WITHIDL WITHPYTHON WITHPHP QMAKE_CXXFLAGS += -std=gnu++11 PRECOMPILED_HEADER += ../../src/misc/mystr.h @@ -420,19 +429,16 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - +QMAKE_CXXFLAGS += -std=gnu++11 +UI_DIR = src/ui +DESTDIR = ../../bin - MOC_DIR = bin/douml/xmi2/MOC_release - OBJECTS_DIR = bin/douml/xmi2/Obj_release +Release { + 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 - +Debug { + 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/deploy/UmlBaseOperation.cpp b/genplugouts/deploy/UmlBaseOperation.cpp index 8ec4cf6cd..b6c6ac378 100644 --- a/genplugouts/deploy/UmlBaseOperation.cpp +++ b/genplugouts/deploy/UmlBaseOperation.cpp @@ -775,9 +775,11 @@ void UmlBaseOperation::read_uml_() } static unsigned api_format() { - QFileInfo info("settings.ini"); - bool test = info.exists(); +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); //int compat = 0; diff --git a/genplugouts/deploy/deploy.pro b/genplugouts/deploy/deploy.pro index 92884cfe8..951761162 100644 --- a/genplugouts/deploy/deploy.pro +++ b/genplugouts/deploy/deploy.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = deplcl -CONFIG += warn_on qt qxt +CONFIG(Debug, Debug|Release) { + CONFIG -= Debug Release + CONFIG += qt warn_on Debug qxt + QMAKE_POST_LINK = " " +} +CONFIG(Release, Debug|Release) { + CONFIG -= Debug Release + CONFIG += qt Release qxt + QMAKE_POST_LINK = " " +} QXT += core DEFINES = WITHCPP WITHJAVA WITHPHP WITHPYTHON WITHIDL TRACE BooL=bool HEADERS = ./UmlBaseExpansionRegion.h \ @@ -407,19 +416,16 @@ SOURCES = ./UmlBaseExpansionRegion.cpp \ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/deploy/MOC_release - OBJECTS_DIR = bin/douml/deploy/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/deplcl + OBJECTS_DIR = $${DESTDIR}/obj_debug/deplcl } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/genplugouts/xmi2import/xmi2import.pro b/genplugouts/xmi2import/xmi2import.pro index 5a2a2ee10..9a55afd2d 100644 --- a/genplugouts/xmi2import/xmi2import.pro +++ b/genplugouts/xmi2import/xmi2import.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = ixmi2 -CONFIG += debug warn_on qt +CONFIG(Debug, Debug|Release) { + CONFIG -= Debug Release + CONFIG += qt warn_on Debug precompile_header + QMAKE_POST_LINK = " " +} +CONFIG(Release, Debug|Release) { + CONFIG -= Debug Release + CONFIG += qt Release precompile_header + QMAKE_POST_LINK = " " +} DEFINES = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON BooL=bool PRECOMPILED_HEADER += ../../src/misc/mystr.h HEADERS = ./UmlActivityPartition.h \ @@ -423,19 +432,16 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - +QMAKE_CXXFLAGS += -std=gnu++11 +UI_DIR = src/ui +DESTDIR = ../../bin - MOC_DIR = bin/douml/xmi2import/MOC_release - OBJECTS_DIR = bin/douml/xmi2import/Obj_release +Release { + 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 - +Debug { + 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/CppGenerator/CppGenerator.pro b/src/CppGenerator/CppGenerator.pro index 25944a070..cb945548a 100644 --- a/src/CppGenerator/CppGenerator.pro +++ b/src/CppGenerator/CppGenerator.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} SOURCES = UmlClassItem.cpp CppRefType.cpp UmlAttribute.cpp \ UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \ UmlExtraClassMember.cpp UmlArtifact.cpp \ @@ -105,18 +114,18 @@ INCLUDEPATH = ../Tools ../CppGenerator ../ #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 +DESTDIR = ../../bin +Release { + MOC_DIR = $${DESTDIR}/moc_release/cpp_generator + OBJECTS_DIR = $${DESTDIR}/obj_release/cpp_generator } -Debug{ - MOC_DIR = ../../bin/MOC_debug/gen/ - OBJECTS_DIR = ../../bin/Obj_debug/gen - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/cpp_generator + OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_generator } - DESTDIR = ../../bin + HEADERS += \ Logging/QsLogDest.h \ diff --git a/src/CppGenerator/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp index 566883ff7..b9b383339 100644 --- a/src/CppGenerator/UmlOperation.cpp +++ b/src/CppGenerator/UmlOperation.cpp @@ -657,7 +657,11 @@ const char * UmlOperation::generate_body(QTextStream & fs, while (*p != '$') indent += toLocale(p); +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); @@ -712,7 +716,11 @@ const char * UmlOperation::generate_body(QTextStream & fs, if (add_nl) fs << '\n'; +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); diff --git a/src/CppGenerator/main.cpp b/src/CppGenerator/main.cpp index 3fdae8ded..ceadc77dc 100644 --- a/src/CppGenerator/main.cpp +++ b/src/CppGenerator/main.cpp @@ -49,7 +49,11 @@ int main(int argc, char ** argv) logger.addDestination(debugDestination.get()); logger.addDestination(fileDestination.get()); +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); QString locale = settings.value("Main/encoding").toString(); QTextCodec* codec = QTextCodec::codecForName(locale); diff --git a/src/CppReverse/cppreverse.pro b/src/CppReverse/cppreverse.pro index 5d5db2478..bbf6bfa4e 100644 --- a/src/CppReverse/cppreverse.pro +++ b/src/CppReverse/cppreverse.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} SOURCES = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \ UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \ UmlExtraClassMember.cpp \ @@ -107,20 +116,17 @@ CONFIG += qtestlib #The following line was inserted by qt3to4 QT += network qt3support -release{ - - - MOC_DIR = bin/douml/cppreverse/MOC_release - OBJECTS_DIR = bin/douml/cppreverse/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/cpp_reverse + OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_reverse } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/src/CppRoundtrip/cpproundtrip.pro b/src/CppRoundtrip/cpproundtrip.pro index 9ce979f0c..bf5268984 100644 --- a/src/CppRoundtrip/cpproundtrip.pro +++ b/src/CppRoundtrip/cpproundtrip.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} SOURCES = main.cpp Statistic.cpp \ ../CppReverse/UmlClassItem.cpp \ ../CppReverse/UmlAttribute.cpp \ @@ -158,19 +167,16 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/roundtrip/MOC_release - OBJECTS_DIR = bin/douml/roundtrip/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/cpp_roundtrip + OBJECTS_DIR = $${DESTDIR}/obj_debug/cpp_roundtrip } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/src/IdlGenerator/IdlGenerator.pro b/src/IdlGenerator/IdlGenerator.pro index d33483d07..1563da6ca 100644 --- a/src/IdlGenerator/IdlGenerator.pro +++ b/src/IdlGenerator/IdlGenerator.pro @@ -1,6 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on - +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 = " " +} SOURCES = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \ UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \ UmlExtraClassMember.cpp \ @@ -105,16 +113,14 @@ DESTDIR = ../../bin 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 +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/idl_generator + OBJECTS_DIR = $${DESTDIR}/obj_debug/idl_generator } - DESTDIR = ../../bin - diff --git a/src/JavaCat/javacat.pro b/src/JavaCat/javacat.pro index 8b0ed2368..9aa423cde 100644 --- a/src/JavaCat/javacat.pro +++ b/src/JavaCat/javacat.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} HEADERS = JavaCatWindow.h BrowserView.h BrowserSearchDialog.h ShowFileDialog.h \ CommentView.h SOURCES = UmlClassItem.cpp UmlAttribute.cpp UmlArtifact.cpp \ @@ -109,19 +118,16 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/java_cat/MOC_release - OBJECTS_DIR = bin/douml/java_cat/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/java_catalog + OBJECTS_DIR = $${DESTDIR}/obj_debug/java_catalog } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/src/JavaGenerator/JavaGenerator.pro b/src/JavaGenerator/JavaGenerator.pro index 400253588..3ae853976 100644 --- a/src/JavaGenerator/JavaGenerator.pro +++ b/src/JavaGenerator/JavaGenerator.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} SOURCES = UmlClassItem.cpp UmlAttribute.cpp \ UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \ UmlExtraClassMember.cpp UmlArtifact.cpp \ @@ -104,16 +113,13 @@ DESTDIR = ../../bin 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 +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/java_generator + OBJECTS_DIR = $${DESTDIR}/obj_debug/java_generator } - - DESTDIR = ../../bin - diff --git a/src/JavaReverse/javareverse.pro b/src/JavaReverse/javareverse.pro index 2c528778b..f6657e742 100644 --- a/src/JavaReverse/javareverse.pro +++ b/src/JavaReverse/javareverse.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} HEADERS = SOURCES = main.cpp BrowserNode.cpp Statistic.cpp \ ../JavaCat/UmlClassItem.cpp ../JavaCat/UmlArtifact.cpp \ @@ -109,16 +118,14 @@ INCLUDEPATH = ../Tools ../JavaReverse ../JavaCat ../ QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 -Release{ - MOC_DIR = ../../bin/MOC_release/java_rev - OBJECTS_DIR = ../../bin/Obj_release/java_rev +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/java_reverse + OBJECTS_DIR = $${DESTDIR}/obj_debug/java_reverse } - DESTDIR = ../../bin - diff --git a/src/JavaRoundtrip/javaroundtrip.pro b/src/JavaRoundtrip/javaroundtrip.pro index cc56d5b29..cd27409c3 100644 --- a/src/JavaRoundtrip/javaroundtrip.pro +++ b/src/JavaRoundtrip/javaroundtrip.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} HEADERS = SOURCES = main.cpp BrowserNode.cpp Statistic.cpp \ ../JavaCat/UmlClassItem.cpp ../JavaCat/UmlArtifact.cpp \ @@ -110,16 +119,14 @@ QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 -release{ - MOC_DIR = ../../bin/MOC_release/java_round - OBJECTS_DIR = ../../bin/Obj_release/java_round +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/java_roundtrip + OBJECTS_DIR = $${DESTDIR}/obj_debug/java_roundtrip } - DESTDIR = ../../bin - diff --git a/src/Libs/L_UniversalModels/L_UniversalModels.pro b/src/Libs/L_UniversalModels/L_UniversalModels.pro index 6fc38365b..6d7010145 100644 --- a/src/Libs/L_UniversalModels/L_UniversalModels.pro +++ b/src/Libs/L_UniversalModels/L_UniversalModels.pro @@ -10,16 +10,14 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = UniversalModels TEMPLATE = lib -CONFIG+= build_all +CONFIG+= build_all staticlib TARGET = $$qtLibraryTarget(UniversalModels) - INCLUDEPATH += include \ ../L_UniversalModels QMAKE_CXXFLAGS += -std=gnu++11 - DEFINES += L_TREE_CONTROLLER_LIBRARY HEADERS += include/TreeModel.h \ @@ -44,18 +42,14 @@ SOURCES += src/TreeModel.cpp \ src/treeviewtemplatefunctions.cpp \ src/genericeventfilter.cpp -Debug{ - MOC_DIR = .../.././build/MOC_debug/UniversalModels - OBJECTS_DIR = ../../../build/Obj_debug/UniversalModels - RCC_DIR = ../../../build/RCC_debug/UniversalModels +DESTDIR = ../../../bin +Release { + MOC_DIR = $${DESTDIR}/moc_release/UniversalModels + OBJECTS_DIR = $${DESTDIR}/obj_release/UniversalModels } -Release{ - MOC_DIR = ../../../build/MOC_release/UniversalModels - OBJECTS_DIR = ../../../build/Obj_release/UniversalModels - RCC_DIR = ../../../build/RCC_release/UniversalModels +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/UniversalModels + OBJECTS_DIR = $${DESTDIR}/obj_debug/UniversalModels } - - - UI_DIR = UI - DESTDIR = ../../../bin +UI_DIR = UI diff --git a/src/PhpGenerator/PhpGenerator.pro b/src/PhpGenerator/PhpGenerator.pro index 8e7598627..00648411d 100644 --- a/src/PhpGenerator/PhpGenerator.pro +++ b/src/PhpGenerator/PhpGenerator.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} SOURCES = UmlClassItem.cpp UmlAttribute.cpp \ UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \ UmlExtraClassMember.cpp UmlArtifact.cpp \ @@ -96,18 +105,17 @@ SOURCES = UmlClassItem.cpp UmlAttribute.cpp \ TARGET = php_generator DEFINES = WITHPHP INCLUDEPATH = ../Tools ../PhpGenerator ../ -DESTDIR = ../../bin #The following line was inserted by qt3to4 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 +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/php_generator + OBJECTS_DIR = $${DESTDIR}/obj_debug/php_generator } diff --git a/src/PhpReverse/phpreverse.pro b/src/PhpReverse/phpreverse.pro index dd691ef3a..ed029f1ee 100644 --- a/src/PhpReverse/phpreverse.pro +++ b/src/PhpReverse/phpreverse.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} HEADERS = SOURCES = main.cpp \ UmlClassItem.cpp UmlArtifact.cpp \ @@ -110,19 +119,15 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/php_rev/MOC_release - OBJECTS_DIR = bin/douml/php_rev/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/php_reverse + OBJECTS_DIR = $${DESTDIR}/obj_debug/php_reverse } - UI_DIR = src/ui - DESTDIR = ../../bin - +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/src/PythonGenerator/PythonGenerator.pro b/src/PythonGenerator/PythonGenerator.pro index 7b96c2c89..36c130868 100644 --- a/src/PythonGenerator/PythonGenerator.pro +++ b/src/PythonGenerator/PythonGenerator.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} SOURCES = UmlClassItem.cpp UmlAttribute.cpp \ UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \ UmlExtraClassMember.cpp UmlArtifact.cpp \ @@ -102,19 +111,16 @@ DESTDIR = ../../bin QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/py_gen/MOC_release - OBJECTS_DIR = bin/douml/py_gen/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/python_generator + OBJECTS_DIR = $${DESTDIR}/obj_debug/python_generator } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/src/RoundtripBody/RoundtripBody.pro b/src/RoundtripBody/RoundtripBody.pro index 232d22d46..968b0fd7e 100644 --- a/src/RoundtripBody/RoundtripBody.pro +++ b/src/RoundtripBody/RoundtripBody.pro @@ -1,5 +1,14 @@ TEMPLATE = app -CONFIG += qt warn_on +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 = " " +} SOURCES = main.cpp util.cpp \ UmlClassItem.cpp UmlAttribute.cpp \ UmlClass.cpp UmlClassDiagram.cpp UmlClassMember.cpp \ @@ -103,19 +112,16 @@ INCLUDEPATH = ../Tools ../RoundtripBody QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/rtrip_body/MOC_release - OBJECTS_DIR = bin/douml/rtrip_body/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/roundtrip_body + OBJECTS_DIR = $${DESTDIR}/obj_debug/roundtrip_body } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/src/Tools/UmlBaseOperation.cpp b/src/Tools/UmlBaseOperation.cpp index 52d6cb9d7..dd80be59b 100644 --- a/src/Tools/UmlBaseOperation.cpp +++ b/src/Tools/UmlBaseOperation.cpp @@ -17,7 +17,11 @@ unsigned api_format(bool useTrueFormat) { +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); //int compat = 0; diff --git a/src/dialog/About.cpp b/src/dialog/About.cpp index 3f8a62267..a0a1e2b36 100644 --- a/src/dialog/About.cpp +++ b/src/dialog/About.cpp @@ -66,11 +66,11 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) const char htmltext[] = "

DoUML

\n" "

This project is a fork of\n" "Bruno Pages's work, BoUML:\n" - "http://sourceforge.net/projects/douml/

\n" + "http://sourceforge.net/projects/bouml/

\n" "

DoUML focus is to port BoUML to Qt4\n" "and to maintain it as a community

\n" "

Join us at:
\n" - "https://github.com/leonardo2d/douml/
\n" + "https://github.com/DoUML/douml
\n" "#bdouml@irc.freenode.net

\n\n\n"; Q3TextView * tx = diff --git a/src/dialog/EnvDialog.cpp b/src/dialog/EnvDialog.cpp index 6ac24617b..647b3bf1c 100644 --- a/src/dialog/EnvDialog.cpp +++ b/src/dialog/EnvDialog.cpp @@ -645,7 +645,11 @@ int read_doumlrc() else if (!strncmp(line, "CHARSET ", 8)) { set_codec(line + 8); - QSettings settings("settings.ini", QSettings::IniFormat); +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else + QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); settings.setValue("Main/encoding", QString(line + 8)); settings.sync(); diff --git a/src/douml.pro b/src/douml.pro index 89ff17ed0..1ddf30f2a 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -1,16 +1,15 @@ TEMPLATE = app INCLUDEPATH += browser data diagram dialog misc tool xpm DEPENDPATH += browser data diagram dialog misc tool xpm -INCLUDEPATH += boost src ui .. $$PWD Libs/L_UniversalModels -#CONFIG += qt warn_on debug -CONFIG(debug, debug|release) { - CONFIG -= debug release - CONFIG += qt warn_on debug +INCLUDEPATH += boost src ui .. Libs/L_UniversalModels +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 +CONFIG(Release, Debug|Release) { + CONFIG -= Debug Release + CONFIG += qt Release QMAKE_POST_LINK = " " } HEADERS = \ @@ -534,49 +533,18 @@ DEFINES = BooL=bool DEBUGCOM #The following line was inserted by qt3to4 QT += core gui network 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 +Release { + MOC_DIR = $${DESTDIR}/moc_release/douml + OBJECTS_DIR = $${DESTDIR}/obj_release/douml } -UI_DIR = ui -DESTDIR = ../bin +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/douml + OBJECTS_DIR = $${DESTDIR}/obj_debug/douml +} QMAKE_CXXFLAGS += -std=gnu++11 LIBS += -L../bin -lUniversalModels @@ -587,4 +555,3 @@ FORMS += \ ui/constructorinitializerdialog.ui \ ui/catalogwidget.ui \ ui/quickedit.ui - diff --git a/src/main.cpp b/src/main.cpp index 0f2c8ec32..a86b5267a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -59,11 +59,12 @@ #include #include - - - #include "translate.h" +#ifdef Q_OS_LINUX +#include "settings_ini.h" +#endif /* Q_OS_LINUX */ + bool ExitOnError = FALSE; int main(int argc, char ** argv) { @@ -86,7 +87,7 @@ int main(int argc, char ** argv) logger.addDestination(debugDestination.get()); logger.addDestination(fileDestination.get()); QLOG_INFO() << "Starting the log"; -//#endif +//#endif /* DEBUG */ An factory; @@ -101,7 +102,26 @@ int main(int argc, char ** argv) UmlDesktop::init(); +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + QFileInfo settings_info(settings.fileName()); + if(!settings_info.exists()) + { + QDir settings_path(settings_info.absolutePath()); + if(!settings_path.exists()) + { + settings_path.mkpath(settings_path.absolutePath()); + } + QFile settings_file(settings_info.absoluteFilePath()); + settings_file.open(QIODevice::WriteOnly); + QByteArray data((const char *)settings_ini, settings_ini_len); + settings_file.write(data); + settings_file.close(); + } + settings.sync(); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif /* Q_OS_LINUX */ settings.setIniCodec(QTextCodec::codecForName("UTF-8")); bool overridePresent = QFileInfo("override_transition.txt").exists(); if(settings.value("Main/compatibility_save") .toInt() == 1 && !overridePresent) diff --git a/src/misc/myio.cpp b/src/misc/myio.cpp index b9d9f7b34..81b57652e 100644 --- a/src/misc/myio.cpp +++ b/src/misc/myio.cpp @@ -3014,7 +3014,11 @@ void set_last_used_directory(QString s) unsigned api_format(bool useTrueFormat) { +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); if((compat != 1) || useTrueFormat) diff --git a/src/tool/Tool.cpp b/src/tool/Tool.cpp index 4f2e2e864..306f1eb4e 100644 --- a/src/tool/Tool.cpp +++ b/src/tool/Tool.cpp @@ -158,7 +158,11 @@ void Tool::defaults() QList SetupFailingTools() { +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); return settings.value("Failing_Tools/Tools").toString().split(","); } diff --git a/src/tool/ToolCom.cpp b/src/tool/ToolCom.cpp index f6eb3e544..837b29c26 100644 --- a/src/tool/ToolCom.cpp +++ b/src/tool/ToolCom.cpp @@ -970,7 +970,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,8 +985,7 @@ void ToolCom::processFinished() } //else - } - + }*/ } diff --git a/src/tool/ToolCom.h b/src/tool/ToolCom.h index 59d45f2ca..e746ada33 100644 --- a/src/tool/ToolCom.h +++ b/src/tool/ToolCom.h @@ -89,7 +89,11 @@ class ToolCom : public QObject public: unsigned api_format(bool trueFormat = false) const { - QSettings settings("settings.ini", QSettings::IniFormat); +#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); +#else + QSettings settings("settings.ini", QSettings::IniFormat); +#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); if((settings.value("Main/compatibility_save") .toInt() != 1) || trueFormat) return api_version; From 8ed2eb80f6adb9cb278472fe33efcb3203ed61f3 Mon Sep 17 00:00:00 2001 From: pasgui Date: Sat, 23 Mar 2013 20:27:49 +0100 Subject: [PATCH 066/297] Add icon for the DoUML executable --- douml.qrc | 8 ++++++++ src/douml.pro | 2 +- src/main.cpp | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 douml.qrc diff --git a/douml.qrc b/douml.qrc new file mode 100644 index 000000000..7cedf1dff --- /dev/null +++ b/douml.qrc @@ -0,0 +1,8 @@ + + + douml.16.png + douml.32.png + douml.48.png + douml.64.png + + diff --git a/src/douml.pro b/src/douml.pro index 1ddf30f2a..6a551d160 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -548,7 +548,7 @@ Debug { QMAKE_CXXFLAGS += -std=gnu++11 LIBS += -L../bin -lUniversalModels -RESOURCES += icons.qrc +RESOURCES += icons.qrc ../douml.qrc FORMS += \ ui/operationwidgetcpp.ui \ diff --git a/src/main.cpp b/src/main.cpp index a86b5267a..1f7a2c79a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,6 +72,7 @@ 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")); From 1c9e5e03446088e17ec36a38fef2c55b74b9c4bf Mon Sep 17 00:00:00 2001 From: pasgui Date: Fri, 29 Mar 2013 21:06:36 +0100 Subject: [PATCH 067/297] Update abou dialog --- douml.png | Bin 0 -> 9018 bytes douml.qrc | 1 + src/dialog/About.cpp | 83 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 douml.png diff --git a/douml.png b/douml.png new file mode 100644 index 0000000000000000000000000000000000000000..f4fe512b90c76f5240a2dd3e2d8f6abeb949c0db GIT binary patch literal 9018 zcmb_?cQjmG)c4HjeGt8c2ubu3#3<1s2vT&T6GR)mmk~j-*zd@4D-rd+t8#?DIQ!|JFJC?z7)MHPU6E<)#Gy01SGMwVwk3 zKoqGyPfbZGLAWLZ(u2~`Kvx@Z{ohsGS^kkEp@BWN^alW#9R9n3pViCVNkXasJwqKT zJQ*L$ZOWXC=S(CKSAdR1fR>M!my34*K+Dg?A;87?X0UsJ+f7|P!>8tOMh*brCO}VH z!z5&OyC4*GW2zIm`05x_r*XqX`zg4Wi;EW%n%MVQ$z!rt`y(eJr{lr2FqX$~GMkn7 zZl!Q#?UlSy+nB#;TA#`zV-*?4hbG_~6gR**qQJ4CI;_FFrj#}rxp|-Nbr%xg;ClMR(l*^h{myM}>H0g)xvgX4C;jC}jQ6*oY)Pn#yirK=~ zwqhpiET}(I)5rUx(pB;<<5A?3Lx~k!nHZX9P@>5OV)wN=g>n}o&w0g@AJ3xnQnfq- zce+`ud=R}HBf`^kmar0QD_AJ;fH~Vv&KI~#DKDf7>V9O)Rs071hG9{pp%CI^saWumKTK zM2VK})hmybm+!F27w{q$U!}6h_vAVY(HY&igN0+BVeZpJufK|$oEVMzH_5bD*M>gR z93PyHXdr06jjq7(V>B?n7-9Q}E5FnO!`)JTn48ouJkxKg*NXJd6UbOSBRUFYEa?sY z2^HV^^F9g64yE5;q#e>KnJynfYwfO<=BVDKGYYU9@H8geAiN}aVVuu7d!(IC^JV69 zFB6`ob^kK$EI#l<7eg}NiW*nZrZ-+x-exS#?Vk*dJUk4(stefH_v-`;DH&pxFp6-F zgTxtNAFM*=Vwh8b^R?c!36|*}qVV2gngiv0XeG(s*|yp2Jw)bsmzO``U7DbBNquI? zT`FY_2rG*AS5YY~g1iq@PG$!Pqxuzd$AQCzlU)Im2*IF{i30mnbz3(%e_G`_;$*40 z5pO1y2=?}Oq&a_)9r~>{G2lSelxBc~?!nj=_thD@7dGkpW1*6hs;qx<3~nA>8{lq` zj58Tm%TYSgpM4&a627JrV8 zC51nxi>rmXr95EEKJ4= z!Ynr7&Zot=5E(i_D=(rjtmG#reFXEVZdoxtkmFOz60cK8Q+jMBJ)F!9g0oV7A4hB* zL*KeI7pptM@$3g$>l0$%5W86FJab?3%}lC*FT8-4`DW1h+prSl&t#0>jOKO+9ZUJV z=v#TTTp#F2aDk`@*McSX)rOIU)YqXG_3o6=}y78I(RUZ8uZ{RgONpbyBsy;V=EK$!#K zf3bnCBxe8knml=4rTmA1qK5Y<>s<**dhLA0UI-eN_` zN0zmob~P5%b2{FK>j=%1&BFKCFtn0(XUE+_lmS6|11*3M8jz22;`E|duYIIpP>jI~ zJi8OcHhO(txu;Z2bsM${MoENI7Cl)}&nsu_N^W+*h46(w+IvfHxl=&yk;E@&Dmze<3_A(Yi@1lI9`1U%5*llo^nH?lS*pBIE&`pvYTj-tl}_ zT*!_eiM7I7F_6ZTn#h`;+9cB|HcFmJ3btiiGhOvj%gOnOJBsg@QM=>ZCZynEH5duc zIs%-ZXb5is7dd?DX46+uGJ2<->N@je?62UP{P!3eoMyEGNrL%mOWjMJ8a z9W?#;yb9hKrV|14D6CWwjE#`KR5mP2FEb__0c|)#6oK>22V^%G@#QV~bgb zxy~PUG|;weYH>iB(}+LTj2e%@RL)DVIH0(h7f)F%%Op$qW!)K#`My{ z8p=ZYUm+|ZqLcyW?(^O4H+ASvwXix=BnfX8RuNUroA~dc`u?# zNE3%+j_7u6&P8RY=S7(}eYp~e?{JP66`3>)YtvI3Szx3Nx#UZ%<@@lgGs4rM5^>W{ zo3(FIGk@6HE>mUmd>yp*H!R0FcRfd|-96rB+IfUwU%cGR6B-V~bK7tdtE&vSyX|;- zqDnkyr@4ko(kVF7mT<^^>_pO0m^}rouu0v0J_HmJ{-`O_w&ov>7U?E!y0VJ9g};uI z!dNs70-aCl%(kAHfBOT$bs2U!&_JQSXm*RitEkjO)P`c{MVQE_3PDKf4sUud2uEBi$4QGq`b6o!41!&!QD88*)D z0Bm(xAG17}QzFDBGO4pgJ6Q?5#!Tt#-|~c->!!>lhWx0(_LFQ=S=c@uep|YYnn^@! z*Yu3RfRMEM#QwH)AI+R#-za5--M0+qmp?V|K0St5BdkX zXImnLpEe7@_{!ne-uoU1WsoF=-k|RT0T=a`rN#Hrxlr*leQc^2km%N>N};|HiVx?^~v>@?%(M0WC-ef4NGAt1tt}WJs$}nfnBC9 zp6|p8H>&<9?zN#QG1y!@`5Y(4r`7v5Oo%t!HF53>OWD8F^9HKb@4UF2%P)hW)K?OO zE^s6^wK{cxXoJhz=bI2U*i7n6f`+9cO%&*Jx^^-#Gz6jUNwnbq~B&fsX8pzr9UuiHL3-8 zed;b^lSvT@cHA$zD{I$kDb{-6=cbBD6CAE?jJ9Tq8J4o3n^-h+Rx)PG8WvWZ)dQoR zM^{qSf|fb~`MGA=2QjZp&t+aVWLYBh!aU@>2t^EmQrh8PE-gOiam#EO5$;NV{KrYe z)0S?#U^E&$nF^oO!F(g=fw!rZd0p*?*6{4`I+ zWQgrdouQGL4R_S1T>}iSG}*JnQG61uX^ly>FRym1q`jE12dsateKN9^YKhD=maqoG z2bXR>%0WG`+!ye!?+YI&)|XK%$|4$C^d99ukKk}Q;@tO7znUcCQi=A2wdG5z37+F@ zhK0}f#Ct;P)~GoBcYlvHNXL}cosVzl^cu<0K)>_6>3TRYU3~KU^um)1$nc_@ z$7HFgrg3wDo1=H#braZ9H8Izj^aCc*#7C#PXq@@@G2xXZ;m1@~v|c<4p9s!ABG>^d z8kgA=>lnPSuGKCU^@la^vZanf-ztm!U z=DV~@WN-^%FbsY9vuqI)vo;>z9O(1wZ$QMkETs|AdNhpj(8{b`+UodCe0ev|i|&Se zikfwe+Etk|lDEtbbreU*jdukE{h`x)+S>FpLOPo2+M_Ot^YGMi;~T@4%-sV7(7#G` zqH1Mhi~PXfA}GN98$^X%vw*?HYfnQbc8m@b-^e0;Sin)l*#I}-K*&0YTev0`tE z>%rN;m$Xf4Jkg5IZpp6dZYT`^b7$Jtvvyr}_7EvPMF0pp3mkBg(&JzEpOnu)Xj zemiJrIpC>3kbTt`yII@7u1WojM)giJ#_PxFmnSabap3zy4KZQwLg0B>`DNg z^0gF`uY2j{n^Ja_RUc9dzRK(RKZ0bg#q!FnH{g=89PXz~`bL()vOuq?+i~FLCxwwu zC>>pYPNz_`!ke^=_!ghBk%rF|Ha}M@pI=usDqoOh?90E`k-xqF(*8zW z`>aqwWvo&)B_-Jl+3L1hfO(}Yji9zpn=Arl=(~OL`&CLvrT+35eLiSDQ_znIm;msq zbRy|6n~l+eLh@7RplCd_hUT&9GiU@sgiuZYK5sKr9uWNb3rUS7s^`FMPi1Wl6`ko( zd-=*J&b)M=n_h)3MX$?^UKdyk2&|0Oq-KWjVPp!in-6xnHhR5GSy(<+j)&BM`p6dh z>(*>fRDRc4N6`qzB_cLe5$!6=#|+bwwfg$89pt^fO43}Mc@9Giz$mi(^02#c;P;{2 zrZLfFe0%o_}qoLJbRGCc>J!2C2knIXx{-c~UastD%L-fhY01-17kz6KvCvc5-Qu7Sh- zj$;L67gV{4LUG`Y002h_|Hz8(fy$nty|08Y&LHFh3uFR)YNW<Sx{kh7%_3F8l6VQzhc zyj1D<*;~U-j!fRbb&iTSx?cQChYuKW0@bO*YJYctOZwV4aEk}ogwQ7=OD|hIq;%Vk z8%6eC$=f6V)hR?=(C+l+WG5TJH{(7FB9A*_w`Yss0wAB@1bV$GxAq0fVPO0Rnay#_ zz>`q3SwvjEE|N}AyZJyE_V4;kkOTsahK7e21v9r=wGd?8L6R^t>mH+fMUHx|qKXbD z=y`)KE($n5XhPWCff#V5NK1iP5z#s|{zOBjxRr5Vz? zaBnabBcNJKNE0#!v^rsDo&*m|*YcEis>3Ar#7?3W>LEA6MGB6;+|V?MMaLwlAcAR8 zbL1CH1mm6Pu^|e{g3Ef3hu;0G7*59EO#DfPjb zIbaR`!Lbd7)XXti1&=TB2Nryo%TL3Xn-8lRj6oc&xKw{L{M27w?jCYid?aGlCSEX( zI)Q0^qq?aWB8FeDZnk7;cKZxud?Xgsd_4^h+tU1F-R}oQukTl`?~{$(3OvE{#uW7b z$!>U>=#6#4v;{8?0Sk41G}G0xgS)Mv=g)U%^EOx%EnykX(lA;W0}Kk>^tRhNR>~@Q zZT05!{ldON!v`c>+}7IFVztcSd!ildRxZ0SHRHRkn3Q zh=m9K9Vb&aQ;0xjZ%dJW`NC*&$&H-LX*l5p)qa9Okv2Ey`E#ipMC8GYsDqgQzQO5pz^yOI$uM8+41=M(f_Q=)KYgXVE8GO*|M3cwdU;g2-;H?VQAp_gKlLm z^kK0p`4SKL7DGy}q>?JPl3J3T<_$f%Jto5aEy051n2bVfuF&NLYfF`{LLDcBQFP!5 zNR;K#t)R6v>Mb)TESc*AF==@Qh9~Y`tFP=68?P9FefDT|o^-sBuoup|SFzqEh7Qh_ znmRxIv+u3W86K#zN$$rU)Zr;H%cczyZGW@J066v)3jDY6EXg+5mHylw{q%$~9-_|F zJhln66i&FiI$X~Aua1Bfm z?Ys^`(#pt(XNOBmLwRlA-fk5d(Iy2zGga&4{X_&0q~pfi{kZ{}K%bM1kH@W>*JVu} zo#XRCs&hxJW2J5U5abMD+&t@6fm)DfKQ>K05U{;-Z8n|lV{ne1ifnn{;UX4P8XeRo0T=SQtoF}*?o%u^hrUbI z5J~R?CRGwp*E&&VWMa4l!?r$4GoHFRLobjTFt@-3_gma3HI#-XA8h)x72Qs^S&vU( z@Z5FWItvI?S7_Tc+`^g8h;4_PPrsBBZ7=;@=IIj7;X*fu7Hq9|;#gfv@vy5CB+#6G53t)grRZEdiezld8VcEoQs{bJ=0m^dgRA*$Rqruk3sC!5 zEQ=T@0Bb%b{I~<7MBT*7ajZSIPVZBnTTfz1O#RQ@{2_j4N*w0%vVK`*t6u6G?ffRD z88^YgU8hT^`%4ib$6e`iCDI4~8@$KYL@_+fmI-D4T*Q;DFW9)&H&6JvWtPsvh@ zL~!)T04zGH@A5M!D;2&o)AG(;E|ff2fS|E;_09`dgW~_XbD*c)>Oiq0WPfii*gBLQ z-RhRUClC$AK<#R#5bii@TLFr_}B+txMmfc&x-nb}`blUK>2U(C1ws5(j2u zMXe4i|3;|ppHJ_cb;!4#pgn@^joCh9y+6<2RvXEDO5mQTZt}->9*i$9fEzJKJ^ah= z&~{?~Zo+)$biFR?(N`nyP`pj_oszjaP}aZ*)vfsGca7w&s4$uN%f%E`UUSmsc@I|Z z0^Qw3wwBpgn__5B|BVCb=Dz!~RNZRn{*yUWgdPa8Y7 zF)s^vG9)5Ks(o_=jQ~ncj2KftV*q7^wpiaAXxt_*D#%GzSVsnDhIh_{4vOIyAGHL( zzmgmZ^GJC{=qsi9t0EfYyBchMb@b!?&T*o54=r?lDR?UDo4Z5DNSc!$$uX3H)A{+7 zo~u&Z!~l)0FAz;1s?fd2OFB96peYu zYfxdZIPUiFPv|T^96`Ap?W<%o&wX{J;OvRCfxw*BpHH%6I3=v?pbJ&s4k1@f2?B>RxBtq}#=ryK-A z;?lMH`nr4&R4&JFI>rCi|LVcx|Kb_u|DUSQ;71!0dQqIF5|@l7J|7J9Ek|pjFEUOA z`6&h&V1}uB`+q&g)vV#SF%y{57!H5iyp-$mbzg{T^7);kN7SSU`8`Qegcv3vP}m>? zy9(Qx5K!Vjy#?dj;~lm58gfWwH0XCJY@e0=I~81#XW^Pf))>QXFR@2u|1eYWZ$yz~ z>okB4u0V(+{7Bh*1TqG0#+VTp2nRr7JEu}Lrn#0(0JX=_e(D@f9Lb80`1^k3RX=_C zQ(I>uuYDO^_}#s!l=Epoa(+>AOjTp=l2w*e4TjfV2u4wdv2>Cm>!DlmLCXIGMpJkv zf@_P}=Up&%4XE&8%XbbEs6l1F3^4>W@ZapiY@q?oPFl@gahN~+MU04jUHFUWCJaJy zy7~6bHu`&~uM~xmvHt<(-UtTykgVn0%@5FpCEI031+}oYBKM2~_GLo3i&1}W`^<&Q$t(DaM`wcvj``d8QpB`PQ757hhJQp#V(h1<`b z*!V-wKR>ix^Kc7?Y~J$hh^6Hnt~8FW2%$#_+jFfMOsDg%Iy&kj?ly=E!~Xjo6)~ws zVEAT{ua~*K*6c|UPyloSumc^_a*n*gWP_#^)~MC1v!y{%q=bXa|8fB^I^PkV-n6Sa zBGz#HpZUdK7yXC+PLEKwnIWMRKcwWO=xF9MsrPAb!R`_aJx}nklP(Sog6u@I;6uK< zBC2Km4ev0fG`Y^tA*U|%o0J5TEzW+@`ZO6#r!q11u+x%Yb^G8}+G0-&r=3+SG&wiR zDIXT+AU7kLc!*8&cM*GC1ezvW^f$A>^{HF8>p%E@hfT|pMASQSd=C+TY0Pko!MgSq zPEXlC22$TR*GHx<362__`M3+fxvz&Wp+8X1N>j-0=Keud`;aMp&?2etiw z7~}@(sP=AoW;tYsbSCrp46V2kI(Z#bX?T}@_pfA+9|fiP(d3P2Y{q~~V#zmNg$h8F zitfQArhAj*#^+V2@+l8}y^$0zZzN8jk?+L)(;RzGa+4k~OY++{Wmc2)bh<2t&r`4_qRW8iR=bq-2)ExL8%$`c>)W_c>3Wdm1V zor=@DzfMt&_)9K0Cu+y{_uk*E59E5rqslkotR;Ql8aTZvcBo+z9IQ53AE^tw^s~U4 z=^BK!`U9L{i-*kxQ0WF_V%Lozu_a8wtP-6eDHwO>HRjFg0PZchHT2erjl7`#|2-u{ cd;UU^a^Z_u8RxVcDWwIVr(>jz)U=QNACc1pe*gdg literal 0 HcmV?d00001 diff --git a/douml.qrc b/douml.qrc index 7cedf1dff..6cf1d233c 100644 --- a/douml.qrc +++ b/douml.qrc @@ -4,5 +4,6 @@ douml.32.png douml.48.png douml.64.png + douml.png diff --git a/src/dialog/About.cpp b/src/dialog/About.cpp index a0a1e2b36..f29e603e0 100644 --- a/src/dialog/About.cpp +++ b/src/dialog/About.cpp @@ -37,16 +37,18 @@ #include #include #include - +#include +#include #include "About.h" #include "bp_xpm.xpm" #include "UmlDesktop.h" #include "translate.h" +#define LICENSE_GPL _() + AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) { setCaption(TR("About DoUML")); - //move(p); Q3VBoxLayout * vbox = new Q3VBoxLayout(this); Q3HBoxLayout * hbox; @@ -56,14 +58,36 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) hbox = new Q3HBoxLayout(vbox); hbox->setMargin(5); - QPixmap bp((const char **) bp_xpm); - // QLabel * lbp = new QLabel(this); + 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("1.0b6")); + 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 Q3HBoxLayout(vbox); + QTabWidget *tabs = new QTabWidget(this); + + // Description + + QWidget *page_description = new QWidget; - // lbp->setPixmap(bp); - // hbox->addWidget(lbp); - hbox->addWidget(new QLabel(" ", this)); - // Replacing about to bouml-ng - const char htmltext[] = "

DoUML

\n" + hbox = new Q3HBoxLayout; + hbox->setMargin(5); + + const char htmltext_description[] = "

DoUML

\n" "

This project is a fork of\n" "Bruno Pages's work, BoUML:\n" "http://sourceforge.net/projects/bouml/

\n" @@ -73,8 +97,34 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) "https://github.com/DoUML/douml
\n" "#bdouml@irc.freenode.net

\n\n\n"; - Q3TextView * tx = - new Q3TextView(htmltext, QString(), this); + Q3TextView * tx_description = new Q3TextView(htmltext_description, QString(), this); + QFont fnt_description = tx_description->font(); + + fnt_description.setItalic(TRUE); + + QFontMetrics fm_description(fnt_description); + + tx_description->setVScrollBarMode(Q3ScrollView::AlwaysOff); + tx_description->setHScrollBarMode(Q3ScrollView::AlwaysOff); + 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 Q3HBoxLayout; + 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"; + + Q3TextView * tx = new Q3TextView(htmltext, QString(), this); QFont fnt = tx->font(); fnt.setItalic(TRUE); @@ -84,8 +134,19 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) tx->setVScrollBarMode(Q3ScrollView::AlwaysOff); tx->setHScrollBarMode(Q3ScrollView::AlwaysOff); tx->setMinimumSize(fm.size(0, htmltext)); + hbox->addWidget(tx); + page_license->setLayout(hbox); + + // Build tabs + + tabs->addTab(page_description, "Description"); + tabs->addTab(page_license, "License"); + vbox->addWidget(tabs); + + // Build button + hbox = new Q3HBoxLayout(vbox); hbox->setMargin(5); QPushButton * ok = new QPushButton(TR("&OK"), this); From b90733b18258afac3fe4c6912336d2c1d0c25591 Mon Sep 17 00:00:00 2001 From: pasgui Date: Fri, 29 Mar 2013 21:06:36 +0100 Subject: [PATCH 068/297] Update about dialog --- douml.png | Bin 0 -> 9018 bytes douml.qrc | 1 + src/dialog/About.cpp | 83 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 douml.png diff --git a/douml.png b/douml.png new file mode 100644 index 0000000000000000000000000000000000000000..f4fe512b90c76f5240a2dd3e2d8f6abeb949c0db GIT binary patch literal 9018 zcmb_?cQjmG)c4HjeGt8c2ubu3#3<1s2vT&T6GR)mmk~j-*zd@4D-rd+t8#?DIQ!|JFJC?z7)MHPU6E<)#Gy01SGMwVwk3 zKoqGyPfbZGLAWLZ(u2~`Kvx@Z{ohsGS^kkEp@BWN^alW#9R9n3pViCVNkXasJwqKT zJQ*L$ZOWXC=S(CKSAdR1fR>M!my34*K+Dg?A;87?X0UsJ+f7|P!>8tOMh*brCO}VH z!z5&OyC4*GW2zIm`05x_r*XqX`zg4Wi;EW%n%MVQ$z!rt`y(eJr{lr2FqX$~GMkn7 zZl!Q#?UlSy+nB#;TA#`zV-*?4hbG_~6gR**qQJ4CI;_FFrj#}rxp|-Nbr%xg;ClMR(l*^h{myM}>H0g)xvgX4C;jC}jQ6*oY)Pn#yirK=~ zwqhpiET}(I)5rUx(pB;<<5A?3Lx~k!nHZX9P@>5OV)wN=g>n}o&w0g@AJ3xnQnfq- zce+`ud=R}HBf`^kmar0QD_AJ;fH~Vv&KI~#DKDf7>V9O)Rs071hG9{pp%CI^saWumKTK zM2VK})hmybm+!F27w{q$U!}6h_vAVY(HY&igN0+BVeZpJufK|$oEVMzH_5bD*M>gR z93PyHXdr06jjq7(V>B?n7-9Q}E5FnO!`)JTn48ouJkxKg*NXJd6UbOSBRUFYEa?sY z2^HV^^F9g64yE5;q#e>KnJynfYwfO<=BVDKGYYU9@H8geAiN}aVVuu7d!(IC^JV69 zFB6`ob^kK$EI#l<7eg}NiW*nZrZ-+x-exS#?Vk*dJUk4(stefH_v-`;DH&pxFp6-F zgTxtNAFM*=Vwh8b^R?c!36|*}qVV2gngiv0XeG(s*|yp2Jw)bsmzO``U7DbBNquI? zT`FY_2rG*AS5YY~g1iq@PG$!Pqxuzd$AQCzlU)Im2*IF{i30mnbz3(%e_G`_;$*40 z5pO1y2=?}Oq&a_)9r~>{G2lSelxBc~?!nj=_thD@7dGkpW1*6hs;qx<3~nA>8{lq` zj58Tm%TYSgpM4&a627JrV8 zC51nxi>rmXr95EEKJ4= z!Ynr7&Zot=5E(i_D=(rjtmG#reFXEVZdoxtkmFOz60cK8Q+jMBJ)F!9g0oV7A4hB* zL*KeI7pptM@$3g$>l0$%5W86FJab?3%}lC*FT8-4`DW1h+prSl&t#0>jOKO+9ZUJV z=v#TTTp#F2aDk`@*McSX)rOIU)YqXG_3o6=}y78I(RUZ8uZ{RgONpbyBsy;V=EK$!#K zf3bnCBxe8knml=4rTmA1qK5Y<>s<**dhLA0UI-eN_` zN0zmob~P5%b2{FK>j=%1&BFKCFtn0(XUE+_lmS6|11*3M8jz22;`E|duYIIpP>jI~ zJi8OcHhO(txu;Z2bsM${MoENI7Cl)}&nsu_N^W+*h46(w+IvfHxl=&yk;E@&Dmze<3_A(Yi@1lI9`1U%5*llo^nH?lS*pBIE&`pvYTj-tl}_ zT*!_eiM7I7F_6ZTn#h`;+9cB|HcFmJ3btiiGhOvj%gOnOJBsg@QM=>ZCZynEH5duc zIs%-ZXb5is7dd?DX46+uGJ2<->N@je?62UP{P!3eoMyEGNrL%mOWjMJ8a z9W?#;yb9hKrV|14D6CWwjE#`KR5mP2FEb__0c|)#6oK>22V^%G@#QV~bgb zxy~PUG|;weYH>iB(}+LTj2e%@RL)DVIH0(h7f)F%%Op$qW!)K#`My{ z8p=ZYUm+|ZqLcyW?(^O4H+ASvwXix=BnfX8RuNUroA~dc`u?# zNE3%+j_7u6&P8RY=S7(}eYp~e?{JP66`3>)YtvI3Szx3Nx#UZ%<@@lgGs4rM5^>W{ zo3(FIGk@6HE>mUmd>yp*H!R0FcRfd|-96rB+IfUwU%cGR6B-V~bK7tdtE&vSyX|;- zqDnkyr@4ko(kVF7mT<^^>_pO0m^}rouu0v0J_HmJ{-`O_w&ov>7U?E!y0VJ9g};uI z!dNs70-aCl%(kAHfBOT$bs2U!&_JQSXm*RitEkjO)P`c{MVQE_3PDKf4sUud2uEBi$4QGq`b6o!41!&!QD88*)D z0Bm(xAG17}QzFDBGO4pgJ6Q?5#!Tt#-|~c->!!>lhWx0(_LFQ=S=c@uep|YYnn^@! z*Yu3RfRMEM#QwH)AI+R#-za5--M0+qmp?V|K0St5BdkX zXImnLpEe7@_{!ne-uoU1WsoF=-k|RT0T=a`rN#Hrxlr*leQc^2km%N>N};|HiVx?^~v>@?%(M0WC-ef4NGAt1tt}WJs$}nfnBC9 zp6|p8H>&<9?zN#QG1y!@`5Y(4r`7v5Oo%t!HF53>OWD8F^9HKb@4UF2%P)hW)K?OO zE^s6^wK{cxXoJhz=bI2U*i7n6f`+9cO%&*Jx^^-#Gz6jUNwnbq~B&fsX8pzr9UuiHL3-8 zed;b^lSvT@cHA$zD{I$kDb{-6=cbBD6CAE?jJ9Tq8J4o3n^-h+Rx)PG8WvWZ)dQoR zM^{qSf|fb~`MGA=2QjZp&t+aVWLYBh!aU@>2t^EmQrh8PE-gOiam#EO5$;NV{KrYe z)0S?#U^E&$nF^oO!F(g=fw!rZd0p*?*6{4`I+ zWQgrdouQGL4R_S1T>}iSG}*JnQG61uX^ly>FRym1q`jE12dsateKN9^YKhD=maqoG z2bXR>%0WG`+!ye!?+YI&)|XK%$|4$C^d99ukKk}Q;@tO7znUcCQi=A2wdG5z37+F@ zhK0}f#Ct;P)~GoBcYlvHNXL}cosVzl^cu<0K)>_6>3TRYU3~KU^um)1$nc_@ z$7HFgrg3wDo1=H#braZ9H8Izj^aCc*#7C#PXq@@@G2xXZ;m1@~v|c<4p9s!ABG>^d z8kgA=>lnPSuGKCU^@la^vZanf-ztm!U z=DV~@WN-^%FbsY9vuqI)vo;>z9O(1wZ$QMkETs|AdNhpj(8{b`+UodCe0ev|i|&Se zikfwe+Etk|lDEtbbreU*jdukE{h`x)+S>FpLOPo2+M_Ot^YGMi;~T@4%-sV7(7#G` zqH1Mhi~PXfA}GN98$^X%vw*?HYfnQbc8m@b-^e0;Sin)l*#I}-K*&0YTev0`tE z>%rN;m$Xf4Jkg5IZpp6dZYT`^b7$Jtvvyr}_7EvPMF0pp3mkBg(&JzEpOnu)Xj zemiJrIpC>3kbTt`yII@7u1WojM)giJ#_PxFmnSabap3zy4KZQwLg0B>`DNg z^0gF`uY2j{n^Ja_RUc9dzRK(RKZ0bg#q!FnH{g=89PXz~`bL()vOuq?+i~FLCxwwu zC>>pYPNz_`!ke^=_!ghBk%rF|Ha}M@pI=usDqoOh?90E`k-xqF(*8zW z`>aqwWvo&)B_-Jl+3L1hfO(}Yji9zpn=Arl=(~OL`&CLvrT+35eLiSDQ_znIm;msq zbRy|6n~l+eLh@7RplCd_hUT&9GiU@sgiuZYK5sKr9uWNb3rUS7s^`FMPi1Wl6`ko( zd-=*J&b)M=n_h)3MX$?^UKdyk2&|0Oq-KWjVPp!in-6xnHhR5GSy(<+j)&BM`p6dh z>(*>fRDRc4N6`qzB_cLe5$!6=#|+bwwfg$89pt^fO43}Mc@9Giz$mi(^02#c;P;{2 zrZLfFe0%o_}qoLJbRGCc>J!2C2knIXx{-c~UastD%L-fhY01-17kz6KvCvc5-Qu7Sh- zj$;L67gV{4LUG`Y002h_|Hz8(fy$nty|08Y&LHFh3uFR)YNW<Sx{kh7%_3F8l6VQzhc zyj1D<*;~U-j!fRbb&iTSx?cQChYuKW0@bO*YJYctOZwV4aEk}ogwQ7=OD|hIq;%Vk z8%6eC$=f6V)hR?=(C+l+WG5TJH{(7FB9A*_w`Yss0wAB@1bV$GxAq0fVPO0Rnay#_ zz>`q3SwvjEE|N}AyZJyE_V4;kkOTsahK7e21v9r=wGd?8L6R^t>mH+fMUHx|qKXbD z=y`)KE($n5XhPWCff#V5NK1iP5z#s|{zOBjxRr5Vz? zaBnabBcNJKNE0#!v^rsDo&*m|*YcEis>3Ar#7?3W>LEA6MGB6;+|V?MMaLwlAcAR8 zbL1CH1mm6Pu^|e{g3Ef3hu;0G7*59EO#DfPjb zIbaR`!Lbd7)XXti1&=TB2Nryo%TL3Xn-8lRj6oc&xKw{L{M27w?jCYid?aGlCSEX( zI)Q0^qq?aWB8FeDZnk7;cKZxud?Xgsd_4^h+tU1F-R}oQukTl`?~{$(3OvE{#uW7b z$!>U>=#6#4v;{8?0Sk41G}G0xgS)Mv=g)U%^EOx%EnykX(lA;W0}Kk>^tRhNR>~@Q zZT05!{ldON!v`c>+}7IFVztcSd!ildRxZ0SHRHRkn3Q zh=m9K9Vb&aQ;0xjZ%dJW`NC*&$&H-LX*l5p)qa9Okv2Ey`E#ipMC8GYsDqgQzQO5pz^yOI$uM8+41=M(f_Q=)KYgXVE8GO*|M3cwdU;g2-;H?VQAp_gKlLm z^kK0p`4SKL7DGy}q>?JPl3J3T<_$f%Jto5aEy051n2bVfuF&NLYfF`{LLDcBQFP!5 zNR;K#t)R6v>Mb)TESc*AF==@Qh9~Y`tFP=68?P9FefDT|o^-sBuoup|SFzqEh7Qh_ znmRxIv+u3W86K#zN$$rU)Zr;H%cczyZGW@J066v)3jDY6EXg+5mHylw{q%$~9-_|F zJhln66i&FiI$X~Aua1Bfm z?Ys^`(#pt(XNOBmLwRlA-fk5d(Iy2zGga&4{X_&0q~pfi{kZ{}K%bM1kH@W>*JVu} zo#XRCs&hxJW2J5U5abMD+&t@6fm)DfKQ>K05U{;-Z8n|lV{ne1ifnn{;UX4P8XeRo0T=SQtoF}*?o%u^hrUbI z5J~R?CRGwp*E&&VWMa4l!?r$4GoHFRLobjTFt@-3_gma3HI#-XA8h)x72Qs^S&vU( z@Z5FWItvI?S7_Tc+`^g8h;4_PPrsBBZ7=;@=IIj7;X*fu7Hq9|;#gfv@vy5CB+#6G53t)grRZEdiezld8VcEoQs{bJ=0m^dgRA*$Rqruk3sC!5 zEQ=T@0Bb%b{I~<7MBT*7ajZSIPVZBnTTfz1O#RQ@{2_j4N*w0%vVK`*t6u6G?ffRD z88^YgU8hT^`%4ib$6e`iCDI4~8@$KYL@_+fmI-D4T*Q;DFW9)&H&6JvWtPsvh@ zL~!)T04zGH@A5M!D;2&o)AG(;E|ff2fS|E;_09`dgW~_XbD*c)>Oiq0WPfii*gBLQ z-RhRUClC$AK<#R#5bii@TLFr_}B+txMmfc&x-nb}`blUK>2U(C1ws5(j2u zMXe4i|3;|ppHJ_cb;!4#pgn@^joCh9y+6<2RvXEDO5mQTZt}->9*i$9fEzJKJ^ah= z&~{?~Zo+)$biFR?(N`nyP`pj_oszjaP}aZ*)vfsGca7w&s4$uN%f%E`UUSmsc@I|Z z0^Qw3wwBpgn__5B|BVCb=Dz!~RNZRn{*yUWgdPa8Y7 zF)s^vG9)5Ks(o_=jQ~ncj2KftV*q7^wpiaAXxt_*D#%GzSVsnDhIh_{4vOIyAGHL( zzmgmZ^GJC{=qsi9t0EfYyBchMb@b!?&T*o54=r?lDR?UDo4Z5DNSc!$$uX3H)A{+7 zo~u&Z!~l)0FAz;1s?fd2OFB96peYu zYfxdZIPUiFPv|T^96`Ap?W<%o&wX{J;OvRCfxw*BpHH%6I3=v?pbJ&s4k1@f2?B>RxBtq}#=ryK-A z;?lMH`nr4&R4&JFI>rCi|LVcx|Kb_u|DUSQ;71!0dQqIF5|@l7J|7J9Ek|pjFEUOA z`6&h&V1}uB`+q&g)vV#SF%y{57!H5iyp-$mbzg{T^7);kN7SSU`8`Qegcv3vP}m>? zy9(Qx5K!Vjy#?dj;~lm58gfWwH0XCJY@e0=I~81#XW^Pf))>QXFR@2u|1eYWZ$yz~ z>okB4u0V(+{7Bh*1TqG0#+VTp2nRr7JEu}Lrn#0(0JX=_e(D@f9Lb80`1^k3RX=_C zQ(I>uuYDO^_}#s!l=Epoa(+>AOjTp=l2w*e4TjfV2u4wdv2>Cm>!DlmLCXIGMpJkv zf@_P}=Up&%4XE&8%XbbEs6l1F3^4>W@ZapiY@q?oPFl@gahN~+MU04jUHFUWCJaJy zy7~6bHu`&~uM~xmvHt<(-UtTykgVn0%@5FpCEI031+}oYBKM2~_GLo3i&1}W`^<&Q$t(DaM`wcvj``d8QpB`PQ757hhJQp#V(h1<`b z*!V-wKR>ix^Kc7?Y~J$hh^6Hnt~8FW2%$#_+jFfMOsDg%Iy&kj?ly=E!~Xjo6)~ws zVEAT{ua~*K*6c|UPyloSumc^_a*n*gWP_#^)~MC1v!y{%q=bXa|8fB^I^PkV-n6Sa zBGz#HpZUdK7yXC+PLEKwnIWMRKcwWO=xF9MsrPAb!R`_aJx}nklP(Sog6u@I;6uK< zBC2Km4ev0fG`Y^tA*U|%o0J5TEzW+@`ZO6#r!q11u+x%Yb^G8}+G0-&r=3+SG&wiR zDIXT+AU7kLc!*8&cM*GC1ezvW^f$A>^{HF8>p%E@hfT|pMASQSd=C+TY0Pko!MgSq zPEXlC22$TR*GHx<362__`M3+fxvz&Wp+8X1N>j-0=Keud`;aMp&?2etiw z7~}@(sP=AoW;tYsbSCrp46V2kI(Z#bX?T}@_pfA+9|fiP(d3P2Y{q~~V#zmNg$h8F zitfQArhAj*#^+V2@+l8}y^$0zZzN8jk?+L)(;RzGa+4k~OY++{Wmc2)bh<2t&r`4_qRW8iR=bq-2)ExL8%$`c>)W_c>3Wdm1V zor=@DzfMt&_)9K0Cu+y{_uk*E59E5rqslkotR;Ql8aTZvcBo+z9IQ53AE^tw^s~U4 z=^BK!`U9L{i-*kxQ0WF_V%Lozu_a8wtP-6eDHwO>HRjFg0PZchHT2erjl7`#|2-u{ cd;UU^a^Z_u8RxVcDWwIVr(>jz)U=QNACc1pe*gdg literal 0 HcmV?d00001 diff --git a/douml.qrc b/douml.qrc index 7cedf1dff..6cf1d233c 100644 --- a/douml.qrc +++ b/douml.qrc @@ -4,5 +4,6 @@ douml.32.png douml.48.png douml.64.png + douml.png diff --git a/src/dialog/About.cpp b/src/dialog/About.cpp index a0a1e2b36..f29e603e0 100644 --- a/src/dialog/About.cpp +++ b/src/dialog/About.cpp @@ -37,16 +37,18 @@ #include #include #include - +#include +#include #include "About.h" #include "bp_xpm.xpm" #include "UmlDesktop.h" #include "translate.h" +#define LICENSE_GPL _() + AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) { setCaption(TR("About DoUML")); - //move(p); Q3VBoxLayout * vbox = new Q3VBoxLayout(this); Q3HBoxLayout * hbox; @@ -56,14 +58,36 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) hbox = new Q3HBoxLayout(vbox); hbox->setMargin(5); - QPixmap bp((const char **) bp_xpm); - // QLabel * lbp = new QLabel(this); + 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("1.0b6")); + 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 Q3HBoxLayout(vbox); + QTabWidget *tabs = new QTabWidget(this); + + // Description + + QWidget *page_description = new QWidget; - // lbp->setPixmap(bp); - // hbox->addWidget(lbp); - hbox->addWidget(new QLabel(" ", this)); - // Replacing about to bouml-ng - const char htmltext[] = "

DoUML

\n" + hbox = new Q3HBoxLayout; + hbox->setMargin(5); + + const char htmltext_description[] = "

DoUML

\n" "

This project is a fork of\n" "Bruno Pages's work, BoUML:\n" "http://sourceforge.net/projects/bouml/

\n" @@ -73,8 +97,34 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) "https://github.com/DoUML/douml
\n" "#bdouml@irc.freenode.net

\n\n\n"; - Q3TextView * tx = - new Q3TextView(htmltext, QString(), this); + Q3TextView * tx_description = new Q3TextView(htmltext_description, QString(), this); + QFont fnt_description = tx_description->font(); + + fnt_description.setItalic(TRUE); + + QFontMetrics fm_description(fnt_description); + + tx_description->setVScrollBarMode(Q3ScrollView::AlwaysOff); + tx_description->setHScrollBarMode(Q3ScrollView::AlwaysOff); + 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 Q3HBoxLayout; + 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"; + + Q3TextView * tx = new Q3TextView(htmltext, QString(), this); QFont fnt = tx->font(); fnt.setItalic(TRUE); @@ -84,8 +134,19 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) tx->setVScrollBarMode(Q3ScrollView::AlwaysOff); tx->setHScrollBarMode(Q3ScrollView::AlwaysOff); tx->setMinimumSize(fm.size(0, htmltext)); + hbox->addWidget(tx); + page_license->setLayout(hbox); + + // Build tabs + + tabs->addTab(page_description, "Description"); + tabs->addTab(page_license, "License"); + vbox->addWidget(tabs); + + // Build button + hbox = new Q3HBoxLayout(vbox); hbox->setMargin(5); QPushButton * ok = new QPushButton(TR("&OK"), this); From f3c856a19fd55553d1a8256d64962bb3445b2542 Mon Sep 17 00:00:00 2001 From: pasgui Date: Sat, 30 Mar 2013 18:56:36 +0100 Subject: [PATCH 069/297] Add version file --- Makefile | 6 ++++-- README.md | 7 +++---- src/dialog/About.cpp | 16 ++++++++-------- src/dialog/version.h | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 src/dialog/version.h diff --git a/Makefile b/Makefile index 5c6b45eef..e3fece6a2 100644 --- a/Makefile +++ b/Makefile @@ -88,13 +88,15 @@ PROGS=douml \ gxmi2 \ ixmi2 -compile: - ( cd bin && xxd -i settings.ini ../src/settings_ini.h; ) || exit 1 +compile: src/settings_ini.h ( 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 +src/settings_ini.h: bin/settings.ini + ( cd bin && xxd -i settings.ini ../src/settings_ini.h; ) || exit 1 + install: mkdir -p "$(DESTDIR)$(DOUML_DIR)" if test -n "$(DOUML_ICONS_PREFIX_DIR)" ; \ diff --git a/README.md b/README.md index 92b9a5f38..208655252 100644 --- a/README.md +++ b/README.md @@ -127,16 +127,15 @@ Enchancements: Compiling --------- - + L_UniversalModels library needs to be built prior to douml compilation. It is located in src/Libs/L_UniversalModels + * Under Linux: * dependencies: libqt4-dev, libqt4-qt3support, libboost-dev, libfile-fcntllock-perl, vim-common, g++ (>=4.7) * make * make install or make install 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 4.7+ built with aforementioned mingw. * Boost's headers of version 1.5+ must be visible in scope. diff --git a/src/dialog/About.cpp b/src/dialog/About.cpp index f29e603e0..f7e099916 100644 --- a/src/dialog/About.cpp +++ b/src/dialog/About.cpp @@ -25,10 +25,6 @@ // // ************************************************************************* - - - - #include #include #include @@ -40,11 +36,9 @@ #include #include #include "About.h" -#include "bp_xpm.xpm" #include "UmlDesktop.h" #include "translate.h" - -#define LICENSE_GPL _() +#include "version.h" AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) { @@ -64,7 +58,7 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) QPainter p(&pix); p.setFont(QFont("Arial", 14, QFont::Black)); p.setPen( Qt::black ); - p.drawText( p.window(), Qt::AlignCenter, QString("1.0b6")); + p.drawText( p.window(), Qt::AlignCenter, QString(DOUML_VERSION)); p.end(); QLabel * lbp = new QLabel(this); @@ -77,6 +71,12 @@ AboutDialog::AboutDialog() : QDialog(0, "About DoUML", TRUE) lbp->setPixmap(pix); hbox->addWidget(lbp); + hbox = new Q3HBoxLayout(vbox); + hbox->setMargin(5); + lbp = new QLabel(this); + lbp->setText(QString("Build: " DOUML_BUILD_DATE " - Qt version " QT_VERSION_STR)); + hbox->addWidget(lbp); + hbox = new Q3HBoxLayout(vbox); QTabWidget *tabs = new QTabWidget(this); diff --git a/src/dialog/version.h b/src/dialog/version.h new file mode 100644 index 000000000..267de3010 --- /dev/null +++ b/src/dialog/version.h @@ -0,0 +1,33 @@ +// ************************************************************************* +// +// 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.0b6" +#define DOUML_BUILD_DATE "Sat, 30 Mar 2013 18:23:21 +0100" + +#endif /* VERSION_H */ From cc91d5e889ed10162854ca1f92ada5c5b5064d7a Mon Sep 17 00:00:00 2001 From: pasgui Date: Sun, 31 Mar 2013 20:21:53 +0300 Subject: [PATCH 070/297] Update README.md --- README.md | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 208655252..ad54fb0c9 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Enchancements: * A totally new control can be brought up by pressing Ctlr-E on tree nodes. See changelog.txt for details. (section 1.0b4) - Manual +Manual ------ Currently - the manual of Bouml version 4.22 is being used. To access it, set "Manual" path in @@ -127,18 +127,23 @@ Enchancements: Compiling --------- - L_UniversalModels library needs to be built prior to douml compilation. It is located in src/Libs/L_UniversalModels - - * Under Linux: - * dependencies: libqt4-dev, libqt4-qt3support, libboost-dev, libfile-fcntllock-perl, vim-common, g++ (>=4.7) - * make - * make install or make install DESTDIR=[path] + +#### Under Linux: + + * dependencies: libqt4-dev, libqt4-qt3support, libboost-dev, libfile-fcntllock-perl, vim-common, g++ (>=4.7) + * make + * make install or make install DESTDIR=[path] - * Under Windows: + +#### 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 4.7+ built with aforementioned mingw. - * Boost's headers of version 1.5+ must be visible in scope. + * 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 From fa5b048e18b2caa5ffbe7f971dc3b729929a5ac6 Mon Sep 17 00:00:00 2001 From: pasgui Date: Sun, 21 Apr 2013 12:22:37 +0200 Subject: [PATCH 071/297] Move the list of recent projects in the settings.ini file --- src/diagram/UmlWindow.cpp | 90 +++++++++++++++------------------------ 1 file changed, 34 insertions(+), 56 deletions(-) diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index bcb426ced..215cbb690 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -556,42 +556,25 @@ 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); - } - - fclose(fp); + 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; + } } - - // 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); } UmlWindow::~UmlWindow() @@ -712,14 +695,12 @@ void UmlWindow::projectMenuAboutToShow() // historic projectMenu->insertSeparator(); - QString whats = TR("to open this project.

The historic is saved in %1", - homeDir().absFilePath(".douml")); 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); + projectMenu->setWhatsThis(id, TR("to open this project.

The historic is saved in settings.ini")); } } else @@ -860,7 +841,7 @@ 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; @@ -1002,25 +983,22 @@ void UmlWindow::historic_add(QString fn) 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); - } - - fprintf(fp, "compteur d utilisation %d\n", Counter); - - fclose(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; + } } + settings.endGroup(); } void UmlWindow::load_it() @@ -1057,7 +1035,7 @@ void UmlWindow::load(QString fn, bool forcesaveas) 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", @@ -1112,7 +1090,7 @@ void UmlWindow::load(QString fn, bool forcesaveas) "A save-as 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(); From 3b4feefd8c102d0c2e7b53c6b2194359b1668c25 Mon Sep 17 00:00:00 2001 From: pasgui Date: Mon, 22 Apr 2013 20:20:47 +0200 Subject: [PATCH 072/297] Move parameters from .doumlrc to settings.ini --- .gitignore | 2 +- .../CppUtilities/ConstrDestrCopyDialog.cpp | 66 ++---- genplugouts/FileControl/Dialog.cpp | 67 ++---- genplugouts/GlobalChange/Dialog.cpp | 66 ++---- genplugouts/Xmi2Generator/Dialog.cpp | 66 ++---- genplugouts/deploy/UmlBaseOperation.cpp | 7 +- genplugouts/gpro/Dialog.cpp | 65 ++---- genplugouts/uml_projection/Dialog.cpp | 64 ++---- genplugouts/usecasewizard/TabDialog.cpp | 73 ++----- src/CppGenerator/UmlOperation.cpp | 8 - src/CppGenerator/main.cpp | 5 - src/JavaCat/ShowFileDialog.cpp | 65 ++---- src/ProjectControl/main.cpp | 71 ++----- src/ProjectSynchro/main.cpp | 71 ++----- src/Tools/UmlBaseOperation.cpp | 7 +- src/dialog/EnvDialog.cpp | 191 ++++-------------- src/main.cpp | 44 ++-- src/misc/myio.cpp | 4 - src/settings_ini.h | 93 +++++++++ src/tool/Tool.cpp | 4 - src/tool/ToolCom.h | 4 - 21 files changed, 348 insertions(+), 695 deletions(-) create mode 100644 src/settings_ini.h diff --git a/.gitignore b/.gitignore index f6d9ecc5c..f00011ed0 100644 --- a/.gitignore +++ b/.gitignore @@ -108,5 +108,5 @@ qrc_*.cpp src/CppReverse/cpp_reverse /bin/ !/bin/settings.ini -src/settings_ini.h +!src/settings_ini.h /install/ diff --git a/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp b/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp index e38bca4af..1f358687d 100644 --- a/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp +++ b/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp @@ -17,6 +17,8 @@ //Added by qt3to4: #include #include "Logging/QsLog.h" +#include + class FunctionTracer { public: @@ -208,51 +210,25 @@ 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); + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + settings.setIniCodec(QTextCodec::codecForName("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/FileControl/Dialog.cpp b/genplugouts/FileControl/Dialog.cpp index ebf7168ee..5ec0729e9 100644 --- a/genplugouts/FileControl/Dialog.cpp +++ b/genplugouts/FileControl/Dialog.cpp @@ -16,6 +16,9 @@ //Added by qt3to4: #include #include +#include +#include + Dialog::Dialog(bool ci, Q3CString & cmd, BooL & rec, BooL & reload) : QDialog(0, 0, TRUE), _cmd(cmd), _rec(rec), _reload(reload) { @@ -85,51 +88,25 @@ 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); + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + settings.setIniCodec(QTextCodec::codecForName("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.cpp b/genplugouts/GlobalChange/Dialog.cpp index 731816a4f..abdc8e746 100644 --- a/genplugouts/GlobalChange/Dialog.cpp +++ b/genplugouts/GlobalChange/Dialog.cpp @@ -23,7 +23,7 @@ #include #include #include - +#include #include "UmlCom.h" #include "Context.h" #include "UmlItem.h" @@ -306,51 +306,25 @@ void Dialog::polish() // 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(QTextCodec::codecForName("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/Xmi2Generator/Dialog.cpp b/genplugouts/Xmi2Generator/Dialog.cpp index 757d50271..d5baec3fc 100644 --- a/genplugouts/Xmi2Generator/Dialog.cpp +++ b/genplugouts/Xmi2Generator/Dialog.cpp @@ -17,7 +17,7 @@ //Added by qt3to4: #include "misc/mystr.h" #include - +#include #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) @@ -250,51 +250,25 @@ 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); + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + settings.setIniCodec(QTextCodec::codecForName("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/deploy/UmlBaseOperation.cpp b/genplugouts/deploy/UmlBaseOperation.cpp index b6c6ac378..842f5623f 100644 --- a/genplugouts/deploy/UmlBaseOperation.cpp +++ b/genplugouts/deploy/UmlBaseOperation.cpp @@ -775,14 +775,9 @@ void UmlBaseOperation::read_uml_() } static unsigned api_format() { -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif 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) { int fileFormat = settings.value("Main/fileformat").toInt(); diff --git a/genplugouts/gpro/Dialog.cpp b/genplugouts/gpro/Dialog.cpp index 394e58e21..41eabf6e9 100644 --- a/genplugouts/gpro/Dialog.cpp +++ b/genplugouts/gpro/Dialog.cpp @@ -21,6 +21,7 @@ //Added by qt3to4: #include #include +#include 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), @@ -188,51 +189,25 @@ 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); + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + settings.setIniCodec(QTextCodec::codecForName("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/Dialog.cpp b/genplugouts/uml_projection/Dialog.cpp index 4bb6caa4c..6f11a8bd1 100644 --- a/genplugouts/uml_projection/Dialog.cpp +++ b/genplugouts/uml_projection/Dialog.cpp @@ -78,51 +78,25 @@ 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); + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + settings.setIniCodec(QTextCodec::codecForName("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/usecasewizard/TabDialog.cpp b/genplugouts/usecasewizard/TabDialog.cpp index c27ab1805..294d5c265 100644 --- a/genplugouts/usecasewizard/TabDialog.cpp +++ b/genplugouts/usecasewizard/TabDialog.cpp @@ -56,63 +56,26 @@ TabDialog::TabDialog(UmlUseCase * u) : Q3TabDialog(0, ""), uc(u) 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"); - - if (! hd.isEmpty()) { - QDir d(hd); - QString s2 = d.absFilePath(".doumlrc"); - - fp = fopen((const char *) s2, "r"); - } + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + settings.setIniCodec(QTextCodec::codecForName("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))) + { + 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; diff --git a/src/CppGenerator/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp index b9b383339..dbb6b31ce 100644 --- a/src/CppGenerator/UmlOperation.cpp +++ b/src/CppGenerator/UmlOperation.cpp @@ -657,11 +657,7 @@ const char * UmlOperation::generate_body(QTextStream & fs, while (*p != '$') indent += toLocale(p); -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); @@ -716,11 +712,7 @@ const char * UmlOperation::generate_body(QTextStream & fs, if (add_nl) fs << '\n'; -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); diff --git a/src/CppGenerator/main.cpp b/src/CppGenerator/main.cpp index ceadc77dc..bc066b07f 100644 --- a/src/CppGenerator/main.cpp +++ b/src/CppGenerator/main.cpp @@ -49,17 +49,12 @@ int main(int argc, char ** argv) logger.addDestination(debugDestination.get()); logger.addDestination(fileDestination.get()); -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); QString locale = settings.value("Main/encoding").toString(); QTextCodec* codec = QTextCodec::codecForName(locale); QTextCodec::setCodecForLocale(codec); - QLOG_INFO() << " STARTING CPP_GENERATOR"; #endif int port_index; diff --git a/src/JavaCat/ShowFileDialog.cpp b/src/JavaCat/ShowFileDialog.cpp index eec9920de..4a81948d4 100644 --- a/src/JavaCat/ShowFileDialog.cpp +++ b/src/JavaCat/ShowFileDialog.cpp @@ -40,7 +40,7 @@ #include #include "misc/mystr.h" #include - +#include #include "ShowFileDialog.h" ShowFileDialog::ShowFileDialog(const WrapperStr & filename) @@ -80,49 +80,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(QTextCodec::codecForName("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/ProjectControl/main.cpp b/src/ProjectControl/main.cpp index 161994683..f0abc96be 100644 --- a/src/ProjectControl/main.cpp +++ b/src/ProjectControl/main.cpp @@ -46,62 +46,31 @@ 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) diff --git a/src/ProjectSynchro/main.cpp b/src/ProjectSynchro/main.cpp index 2ab5beeaa..82b26b85d 100644 --- a/src/ProjectSynchro/main.cpp +++ b/src/ProjectSynchro/main.cpp @@ -44,62 +44,31 @@ 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) diff --git a/src/Tools/UmlBaseOperation.cpp b/src/Tools/UmlBaseOperation.cpp index dd80be59b..0949f6bb9 100644 --- a/src/Tools/UmlBaseOperation.cpp +++ b/src/Tools/UmlBaseOperation.cpp @@ -17,14 +17,9 @@ unsigned api_format(bool useTrueFormat) { -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif 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(); diff --git a/src/dialog/EnvDialog.cpp b/src/dialog/EnvDialog.cpp index 647b3bf1c..dc04d9535 100644 --- a/src/dialog/EnvDialog.cpp +++ b/src/dialog/EnvDialog.cpp @@ -361,67 +361,19 @@ void EnvDialog::accept() 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); + 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(); } @@ -484,26 +436,6 @@ void EnvDialog::editor_browse() static QString lang_file() { QString lang; - - - - - - - - - - - - - - - - - - - - lang = getenv("LANG"); @@ -574,7 +506,7 @@ void EnvDialog::lang_browse() // -static void propose_lang() +/*static void propose_lang() { // note : QFile fp(QDir::home().absFilePath(".doumlrc")) doesn't work // if the path contains non latin1 characters, for instance cyrillic ! @@ -601,83 +533,34 @@ static void propose_lang() 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)) - { - set_codec(line + 8); -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif - 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; - } + 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::setCodecForTr(QTextCodec::codecForName(s)); + QTextCodec::setCodecForLocale(QTextCodec::codecForName(s)); + 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) + { + UmlDesktop::set_limits(l, t, r, b); } - - fclose(fp); - - if (! lang_set) { - set_lang(""); - - if (! nolang) - propose_lang(); + else + { + UmlDesktop::set_limits(0, 0, 0, 0); } if (id == -1) { diff --git a/src/main.cpp b/src/main.cpp index 1f7a2c79a..053424c3f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -57,13 +57,9 @@ #include "ui/constructorinitializerdialog.h" #include "misc/TypeIdentifier.h" #include -#include #include "translate.h" - -#ifdef Q_OS_LINUX #include "settings_ini.h" -#endif /* Q_OS_LINUX */ bool ExitOnError = FALSE; int main(int argc, char ** argv) @@ -103,8 +99,10 @@ int main(int argc, char ** argv) UmlDesktop::init(); -#ifdef Q_OS_LINUX + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); + settings.setIniCodec(QTextCodec::codecForName("UTF-8")); + QFileInfo settings_info(settings.fileName()); if(!settings_info.exists()) { @@ -118,39 +116,25 @@ int main(int argc, char ** argv) QByteArray data((const char *)settings_ini, settings_ini_len); settings_file.write(data); settings_file.close(); + EnvDialog::edit(TRUE); + settings.sync(); } - settings.sync(); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif /* Q_OS_LINUX */ - settings.setIniCodec(QTextCodec::codecForName("UTF-8")); + 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 settings.ini\n")); } - // 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 + read_doumlrc(); // for virtual desktop init_pixmaps(); init_font(); - Shortcut::init(conv_env); + Shortcut::init(true); bool exec = FALSE; bool no_gui = FALSE; diff --git a/src/misc/myio.cpp b/src/misc/myio.cpp index 81b57652e..b03b93990 100644 --- a/src/misc/myio.cpp +++ b/src/misc/myio.cpp @@ -3014,11 +3014,7 @@ void set_last_used_directory(QString s) unsigned api_format(bool useTrueFormat) { -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); int compat = settings.value("Main/compatibility_save").toInt(); if((compat != 1) || useTrueFormat) diff --git a/src/settings_ini.h b/src/settings_ini.h new file mode 100644 index 000000000..40d2039ee --- /dev/null +++ b/src/settings_ini.h @@ -0,0 +1,93 @@ +unsigned char settings_ini[] = { + 0x5b, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x5d, 0x0a, 0x74, 0x65, + 0x73, 0x74, 0x3d, 0x74, 0x65, 0x73, 0x74, 0x0a, 0x0a, 0x5b, 0x4d, 0x61, + 0x69, 0x6e, 0x5d, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x61, 0x76, 0x65, 0x3d, 0x31, + 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x3d, + 0x37, 0x37, 0x0a, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x3d, + 0x55, 0x54, 0x46, 0x2d, 0x38, 0x0a, 0x0a, 0x5b, 0x46, 0x61, 0x69, 0x6c, + 0x69, 0x6e, 0x67, 0x5f, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x5d, 0x0a, 0x54, + 0x6f, 0x6f, 0x6c, 0x73, 0x3d, 0x22, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, + 0x20, 0x52, 0x6f, 0x73, 0x65, 0x2c, 0x55, 0x6d, 0x6c, 0x20, 0x70, 0x72, + 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x43, 0x2b, 0x2b, + 0x20, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x6d, 0x61, 0x63, 0x68, 0x69, + 0x6e, 0x65, 0x2c, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x20, + 0x58, 0x4d, 0x49, 0x20, 0x31, 0x2e, 0x32, 0x2c, 0x47, 0x65, 0x6e, 0x65, + 0x72, 0x61, 0x74, 0x65, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x22, 0x0a, 0x0a, + 0x5b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5d, 0x0a, 0x71, 0x75, + 0x69, 0x63, 0x6b, 0x65, 0x64, 0x69, 0x74, 0x3d, 0x40, 0x42, 0x79, 0x74, + 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0xc3, 0xbf, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x67, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0xc3, 0xbf, 0xc3, 0xbf, 0xc3, + 0xbf, 0xc3, 0xbf, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0xc2, 0x81, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0xc2, + 0x9b, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x22, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x2e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x3e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x78, 0x33, 0x37, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x2b, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x4c, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x35, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, + 0x34, 0x32, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x78, 0x31, 0x64, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x32, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x35, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x23, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x24, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x28, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2e, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x21, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, + 0x34, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x2d, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x78, 0x33, 0x38, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x69, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x29, 0x0a, 0x0a, 0x5b, 0x71, 0x75, 0x69, 0x63, 0x6b, 0x65, + 0x64, 0x69, 0x74, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x6f, 0x78, + 0x65, 0x73, 0x5d, 0x0a, 0x63, 0x70, 0x70, 0x3d, 0x74, 0x72, 0x75, 0x65, + 0x0a, 0x6a, 0x61, 0x76, 0x61, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, + 0x70, 0x68, 0x70, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x70, 0x79, + 0x74, 0x68, 0x6f, 0x6e, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x69, + 0x64, 0x6c, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x0a, 0x5b, 0x77, + 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5d, 0x0a, 0x73, 0x69, 0x7a, 0x65, 0x3d, + 0x40, 0x53, 0x69, 0x7a, 0x65, 0x28, 0x2d, 0x31, 0x20, 0x2d, 0x31, 0x29, + 0x0a +}; +unsigned int settings_ini_len = 1069; diff --git a/src/tool/Tool.cpp b/src/tool/Tool.cpp index 306f1eb4e..17d2e0d11 100644 --- a/src/tool/Tool.cpp +++ b/src/tool/Tool.cpp @@ -158,11 +158,7 @@ void Tool::defaults() QList SetupFailingTools() { -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); return settings.value("Failing_Tools/Tools").toString().split(","); } diff --git a/src/tool/ToolCom.h b/src/tool/ToolCom.h index e746ada33..d61ba1ae7 100644 --- a/src/tool/ToolCom.h +++ b/src/tool/ToolCom.h @@ -89,11 +89,7 @@ class ToolCom : public QObject public: unsigned api_format(bool trueFormat = false) const { -#ifdef Q_OS_LINUX QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); -#else - QSettings settings("settings.ini", QSettings::IniFormat); -#endif settings.setIniCodec(QTextCodec::codecForName("UTF-8")); if((settings.value("Main/compatibility_save") .toInt() != 1) || trueFormat) return api_version; From a2ca6c6a76d66c130ad9418e9c95dc4bf4d2754a Mon Sep 17 00:00:00 2001 From: zeks Date: Thu, 9 May 2013 20:01:07 +0400 Subject: [PATCH 073/297] Hopefully, now KVTable makes a bit more sense. Needs testing, could break stuff. --- genplugouts/Xmi2Generator/UmlPackage.cpp | 3 +- genplugouts/Xmi2Generator/Xmi2Generator.pro | 2 +- genplugouts/xmi2import/xmi2import.pro | 2 +- src/dialog/ClassDialog.cpp | 2 +- src/dialog/KeyValueTable.cpp | 295 +++++++------------- src/dialog/KeyValueTable.h | 9 +- src/dialog/MLinesItem.cpp | 4 +- src/dialog/MLinesItem.h | 2 +- 8 files changed, 123 insertions(+), 196 deletions(-) diff --git a/genplugouts/Xmi2Generator/UmlPackage.cpp b/genplugouts/Xmi2Generator/UmlPackage.cpp index b49d28977..ddfc1d0fc 100644 --- a/genplugouts/Xmi2Generator/UmlPackage.cpp +++ b/genplugouts/Xmi2Generator/UmlPackage.cpp @@ -174,8 +174,7 @@ void UmlPackage::xmi(int argc, char ** argv) search_profiles(profiles); - out << "\ - \n\ + out << "\n\ updateThisFromNode(currentNode); + kvtable->updateThisFromNode(currentNode, !isWritable); kvtable->remove("stereotypeCheck"); kvtable->remove("stereotypeSetParameters"); kvtable->remove("stereotypeCheckParameters"); diff --git a/src/dialog/KeyValueTable.cpp b/src/dialog/KeyValueTable.cpp index a0e5f0e82..6d72ac85b 100644 --- a/src/dialog/KeyValueTable.cpp +++ b/src/dialog/KeyValueTable.cpp @@ -24,11 +24,6 @@ // home : http://sourceforge.net/projects/douml // // ************************************************************************* - - - - - #include #include #include @@ -44,87 +39,14 @@ #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), +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, TR("Key")); + colNames.insert(1, TR("Value")); + colNames.insert(2, TR("Do")); + Init(kvData, isReadOnly); } void KeyValuesTable::init_row(int index) @@ -191,138 +113,137 @@ 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; - 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(item(index, 0)); - tiKey->setText(hv->get_key(index)); - tiValue = dynamic_cast(item(index, 1)); - tiValue->setText(s); - } - tiKey->setReplaceable(FALSE); - tiValue->setReplaceable(FALSE); + for (index = 0; index != numRows(); index += 1) { + if (text(index, 0) == ks) { + value = text(index, 1); + return TRUE; + } + } + return FALSE; +} - if (n != 0) - { - // note : adjustRow(index) does nothing - setRowHeight(index, rowHeight(index) * (n + 1)); - } +void KeyValuesTable::remove(const char * key) +{ + QString ks = toUnicode(key); + int index; + + for (index = 0; index != numRows(); index += 1) { + if (text(index, 0) == ks) { + delete_row(index); + break; } } - else - { - props.setAutoDelete(TRUE); +} - QStringList items; +void KeyValuesTable::Init(HaveKeyValueData *kvData, bool isReadOnly) +{ + AdjustColumnCount(isReadOnly); + AdjustRowCount(kvData, isReadOnly); + SetupTableText(kvData, isReadOnly); + AdjustEditability(isReadOnly); +} - 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::SetupTableText(HaveKeyValueData *kvData, bool isReadOnly) +{ + QStringList items; + unsigned index = 0; + for (index = 0; index < kvData->get_n_keys(); index++) + { + QString k = toUnicode(kvData->get_key(index)); + QString v = toUnicode(kvData->get_value(index)); - setText(index, 0, k); + TableItem * tiKey = nullptr; + tiKey = new MLinesItem(this, k, !isReadOnly); - if (psl != 0) - setItem(index, 1, new ComboItem(this, v, *psl, FALSE)); + setItem(index, 0, tiKey); - 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)); + if (props.contains(k)) + setItem(index, 1, new ComboItem(this, v, props[k], FALSE)); - setText(index, 2, QString()); - setRowStretchable(index, TRUE); + if ((k.contains(':') == 2) && + ProfiledStereotypes::enumerated(k, items)) + { + props.insert(k, items); + setItem(index, 1, new ComboItem(this, v, props[k], FALSE)); } + else + setItem(index, 1, new MLinesItem(this, 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); - } - - horizontalHeader()->setResizeEnabled(TRUE, 0); //setColumnStretchable (0, TRUE); - setColumnStretchable(1, TRUE); + setItem(index, 2, new TableItem(this, Q3TableItem::Never,"")); + setRowStretchable(index, true); - if (! isReadOnly) { - adjustColumn(2); - setColumnStretchable(2, FALSE); - } + int crCount = v.count('\n'); + if (crCount != 0) + setRowHeight(index, rowHeight(index) * (crCount + 1)); + } + setItem(index, 0, new MLinesItem(this, QString())); + setItem(index, 1, new MLinesItem(this, QString())); + if(!isReadOnly) + setItem(index, 2, new TableItem(this, Q3TableItem::Never,"")); + setRowStretchable(index, TRUE); } -bool KeyValuesTable::get_value(const char * key, QString & value) +void KeyValuesTable::AdjustColumnCount(bool isReadOnly) { - QString ks = toUnicode(key); - int index; + int columnCount = isReadOnly ? 2 : 3; + int currentCount = numCols(); - 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 < columnCount ; current++) + { + insertColumns(current); + horizontalHeader()->setLabel(current, colNames[current]); + } + setColumnStretchable(1, true); + if(!isReadOnly) + { + setColumnStretchable(2, false); + adjustColumn(2); } + horizontalHeader()->setResizeEnabled(true, 0); + horizontalHeader()->setResizeEnabled(true, 1); - return FALSE; } -void KeyValuesTable::remove(const char * key) +void KeyValuesTable::AdjustRowCount(HaveKeyValueData * kvData, bool) { - QString ks = toUnicode(key); - int index; + int rowCount = numRows(); + int index ; + for (index = rowCount - 1; index > -1; index --) + removeRow(0); + for(unsigned i(0); i < kvData->get_n_keys() + 1; i++) + { + insertRows(i); + setRowStretchable(i, true); + } +} + +void KeyValuesTable::AdjustEditability(bool isReadOnly) +{ + int rowCount = numRows(); + for (int i(0); i < rowCount; i++) + { + item(i, 0)->setReplaceable(!isReadOnly); + item(i, 1)->setReplaceable(!isReadOnly); + if(!isReadOnly) + item(i, 2)->setReplaceable(false); + setRowReadOnly(i, isReadOnly); - for (index = 0; index != numRows(); index += 1) { - if (text(index, 0) == ks) { - delete_row(index); - break; - } } } diff --git a/src/dialog/KeyValueTable.h b/src/dialog/KeyValueTable.h index 7f2685ff6..73cc8aec8 100644 --- a/src/dialog/KeyValueTable.h +++ b/src/dialog/KeyValueTable.h @@ -46,8 +46,15 @@ class KeyValuesTable : public StringTable bool get_value(const char * key, QString & value); void remove(const char * key); + private: - Q3Dict props; + void Init(HaveKeyValueData * h, bool isReadOnly); + void SetupTableText(HaveKeyValueData * hv, bool isReadOnly); + void AdjustColumnCount(bool); + void AdjustRowCount(HaveKeyValueData *, bool); + void AdjustEditability(bool); + QHash props; + QHash colNames; }; #endif diff --git a/src/dialog/MLinesItem.cpp b/src/dialog/MLinesItem.cpp index 6b187defa..d54c9769a 100644 --- a/src/dialog/MLinesItem.cpp +++ b/src/dialog/MLinesItem.cpp @@ -37,8 +37,8 @@ #include "DialogUtil.h" -MLinesItem::MLinesItem(Q3Table * ta, const QString & s) - : TableItem(ta, Q3TableItem::WhenCurrent, s) +MLinesItem::MLinesItem(Q3Table * ta, const QString & s, bool editable) + : TableItem(ta, editable ? Q3TableItem::WhenCurrent : Q3TableItem::Never, s) { mle = 0; } diff --git a/src/dialog/MLinesItem.h b/src/dialog/MLinesItem.h index e1e78d2e6..b2dcf8384 100644 --- a/src/dialog/MLinesItem.h +++ b/src/dialog/MLinesItem.h @@ -39,7 +39,7 @@ class MLinesItem : public TableItem QTextEdit * mle; public: - MLinesItem(Q3Table * t, const QString & s); + MLinesItem(Q3Table * t, const QString & s, bool editable = true); virtual QWidget * createEditor() const; virtual void setContentFromEditor(QWidget * w); From d2bc302dc404c92ae31699980067a40e5dcd3011 Mon Sep 17 00:00:00 2001 From: zeks Date: Fri, 10 May 2013 01:44:14 +0400 Subject: [PATCH 074/297] 1) added the capability to add attributes to classes from quick edit 2) added Collapse/Expand submenu to context menu in quick edit --- bin/settings.ini | 2 +- src/CustomWidgets/quickedit.cpp | 155 ++++++++++++++++-- src/CustomWidgets/quickedit.h | 13 ++ .../quickeditcontrollersetup.cpp | 28 +++- src/browser/BrowserClass.cpp | 14 +- src/browser/BrowserClass.h | 1 + src/dialog/OperationDialog.cpp | 8 +- src/douml.pro | 3 + src/tool/snippets.h | 13 ++ src/ui/quickedit.ui | 13 +- 10 files changed, 219 insertions(+), 31 deletions(-) create mode 100644 src/tool/snippets.h diff --git a/bin/settings.ini b/bin/settings.ini index 86e0e3a26..8d4bd6b5d 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -20,4 +20,4 @@ python=false idl=false [window] -size=@Size(-1 -1) +size=@Size(927 595) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 4258c95db..7ec6999e6 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -16,6 +16,7 @@ #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" @@ -110,19 +111,25 @@ void QuickEdit::PerformFiltering(QStringList expandedNodes, QTreeView* view, Tre void QuickEdit::OnContextMenu(QPoint point) { - - CreateMenu(); - QModelIndex current = ui->tvEditor->selectionModel()->currentIndex(); if(!current.isValid()) return; + CreateMenu(); current = current.sibling(current.row(), 0); + + + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); - - if(currentNode->TypeID() != TypeIdentifier::id()) + if(!itemAsInterface) return; + SetupMenu(itemAsInterface); + if(currentNode->TypeID() != TypeIdentifier::id()) + { + contextMenu->removeAction(actBefore); + contextMenu->removeAction(actAfter); + } contextMenu->popup(ui->tvEditor->mapToGlobal(point)); } @@ -145,6 +152,11 @@ void QuickEdit::OnAddOperation() AddOperation(); } +void QuickEdit::OnAddAttribute() +{ + AddAttribute(); +} + void QuickEdit::OnPerformFiltering(QString) { PerformFiltering(expandedNodes, ui->tvEditor, treeModel, rootInterface); @@ -189,20 +201,63 @@ 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()) - { - contextMenu.reset(new QMenu()); - } + 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(); - QAction* before = contextMenu->addAction(tr("Move marked before"), this, SLOT(OnMoveMarkedBefore())); - QAction* after = contextMenu->addAction(tr("Move marked after"), this, SLOT(OnMoveMarkedAfter())); + collapseExpandMenu->addAction(actCollapseExpandSelf); + collapseExpandMenu->addAction(actCollapseExpandParent); + contextMenu->addMenu(collapseExpandMenu); + contextMenu->addSeparator(); + contextMenu->addAction(actBefore); + contextMenu->addAction(actAfter); + if(BrowserNode::marked_nodes().count() == 0) { - before->setEnabled(false); - after->setEnabled(false); + actBefore->setEnabled(false); + actAfter->setEnabled(false); } + else + { + actBefore->setEnabled(true); + actAfter->setEnabled(true); + } + interface->childCount() == 0 ? actCollapseExpandSelf->setEnabled(false) : actCollapseExpandSelf->setEnabled(true); + //itemExpanded ? actCollapseExpand->setText(tr("Collapse")) : actCollapseExpand->setText(tr("Expand")); } void QuickEdit::SetupItemCreationFuncs() @@ -323,7 +378,7 @@ void QuickEdit::AddOperation() BrowserClass* classNode; int newItemPosition = 0; - if(currentNode->TypeID() == TypeIdentifier::id()) //, TypeIdentifier()) + if(currentNode->TypeID() == TypeIdentifier::id()) { classNode = static_cast(currentNode); newItemPosition = itemAsInterface->childCount(); @@ -366,7 +421,68 @@ void QuickEdit::AddOperation() newItemAsNode->SetController(operationController); newItemAsNode->SetParent(sharedOfOperation); newItemAsNode->SetInternalData(newOperation); - //classNode->modified(); +} + +void QuickEdit::AddAttribute() +{ + QModelIndex current = ui->tvEditor->selectionModel()->currentIndex(); + if(!current.isValid()) + return; + + current = current.sibling(current.row(), 0); + TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); + BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); + + BrowserClass* classNode; + + int newItemPosition = 0; + if(currentNode->TypeID() == TypeIdentifier::id()) + { + classNode = static_cast(currentNode); + if(!classNode) + return; + newItemPosition = itemAsInterface->childCount(); + } + else if(currentNode->TypeID() *in(TypeIdentifier::id() ,TypeIdentifier::id()) + && current.parent().isValid()) + { + itemAsInterface = static_cast(current.parent().internalPointer()); + classNode = static_cast(itemAsInterface->InternalPointer()); + newItemPosition = current.row()+1; + current = current.parent(); + } + else + return; + + //classNode->addOperation() + BrowserAttribute* newAttribute = static_cast(classNode->addAttribute()); + QModelIndex parentIndex; + TreeItemInterface* parent; + if(treeModel->parent(current).isValid()) + { + parentIndex = treeModel->parent(current); + parentIndex = parentIndex.sibling(parentIndex.row(), 0); + parent = static_cast(parentIndex.internalPointer()); + } + else + parent = treeModel->RootItem(); + + int insertIndex = parent->GetIndexOfChild(itemAsInterface); + + QSharedPointer sharedOfNode = 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(newItem.internalPointer()); + TreeItem* newItemAsNode = static_cast*>(newItemInterface); + newItemAsNode->SetController(attributeController); + newItemAsNode->SetParent(sharedOfNode); + newItemAsNode->SetInternalData(newAttribute); } void QuickEdit::RefreshTable() @@ -375,6 +491,11 @@ void QuickEdit::RefreshTable() Show(currentNode); } +void QuickEdit::CollapseExpand(const QModelIndex &index) +{ + ui->tvEditor->setExpanded(index, !ui->tvEditor->isExpanded(index)); +} + BrowserNode *QuickEdit::GetCurrentNode() { QModelIndex current = ui->tvEditor->currentIndex(); @@ -456,14 +577,14 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) SetupTreeModel(treeModel,ui->tvEditor,rootInterface,classController,modelRoot); ui->tvEditor->setContextMenuPolicy(Qt::CustomContextMenu); - //ui->tvEditor->setStyleSheet("QTreeView::item { border-right: 1px solid black }"); 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->pbAddAttribute, SIGNAL(clicked()), this, SLOT(OnAddParameter())); + 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)), diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 94a4bb5a3..1cf871668 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -47,6 +47,7 @@ class QuickEdit : public QWidget BrowserView* originalView = nullptr; UmlWindow* mainWindow = nullptr; QScopedPointer contextMenu; + QMenu* collapseExpandMenu = nullptr; QList validTypes; QList > localNodeHolder; QHash, BrowserNode*) > > itemCreators; @@ -79,6 +80,12 @@ class QuickEdit : public QWidget QSharedPointer packageInterface; + QAction* actBefore = nullptr; + QAction* actAfter = nullptr; + QAction* actCollapseExpandSelf = nullptr; + QAction* actCollapseExpandParent = nullptr; + + QStringList columns; //QModelIndex current; BrowserNode* currentNode = nullptr; @@ -101,6 +108,7 @@ class QuickEdit : public QWidget void PerformFiltering(QStringList, QTreeView*, TreeModel*, QSharedPointer); QList > CreateCheckList(); void CreateMenu(); + void SetupMenu(TreeItemInterface *); void VisibilityDelegateSetup(); void TypeDelegateSetup(); void DirectionDelegateSetup(); @@ -112,8 +120,10 @@ class QuickEdit : public QWidget void AddParameter(); void AddOperation(); + void AddAttribute(); void RefreshTable(); + void CollapseExpand(const QModelIndex& index ); @@ -137,6 +147,7 @@ class QuickEdit : public QWidget void OnShow(); void OnAddParameter(); void OnAddOperation(); + void OnAddAttribute(); void OnPerformFiltering(QString); void OnDecreaseOpenLevels(); void OnIncreaseOpenLevels(); @@ -144,6 +155,8 @@ class QuickEdit : public QWidget 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 index 0e9a80602..833d282a1 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -11,6 +11,7 @@ #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" @@ -178,15 +179,15 @@ void QuickEdit::SetupDelegates() PostfixDelegateSetup(); } -// some really insane code from stackoverflow that allows to shorten lengthy ifs -template -bool operator *(const T0& lhs, const std::array& rhs) { - return std::find(begin(rhs), end(rhs), lhs) != end(rhs); -} +//// some really insane code from stackoverflow that allows to shorten lengthy ifs +//template +//bool operator *(const T0& lhs, const std::array& rhs) { +// return std::find(begin(rhs), end(rhs), lhs) != end(rhs); +//} -template std::array in(T0 arg0, T...args) { - return {{arg0, args...}}; -} +//template std::array in(T0 arg0, T...args) { +// return {{arg0, args...}}; +//} #define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ @@ -394,6 +395,17 @@ void QuickEdit::SetupAttributeController() return result; } ); + + std::function f = [](BrowserNode* node ,const QModelIndex& index) + { + Q_UNUSED(index); + BrowserAttribute* attr = static_cast(node); + attr->modified(); + attr->setText(0,attr->get_name() ); + attr->package_modified(); + attr->get_data()->modified(); + }; + attributeController->AddPostProcessors(columns.indexOf("name"), QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); } void QuickEdit::SetupOperationAttributeController() diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 141b50b00..03d9e6eb3 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1327,7 +1327,7 @@ BrowserNode * BrowserClass::add_attribute(BrowserAttribute * attr, if (enter_child_name(name, (enum_item) ? TR("enter item's name : ") : 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); @@ -1349,6 +1349,18 @@ BrowserNode * BrowserClass::add_attribute(BrowserAttribute * 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::duplicate_attribute(BrowserAttribute *attr, bool enum_item) { return add_attribute(attr, enum_item, true); diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index 8f86aea6f..9a55434f5 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -78,6 +78,7 @@ class BrowserClass : public BrowserNode, public Labeled virtual ~BrowserClass(); BrowserNode * add_attribute(BrowserAttribute * attr = 0, bool enum_item = FALSE, bool sameName = false); + BrowserNode * addAttribute(); BrowserNode * duplicate_attribute(BrowserAttribute * attr = 0, bool enum_item = FALSE); BrowserNode * add_relation(BrowserRelation * rel); BrowserNode * add_operation(BrowserOperation * oper = 0, bool sameName = false); diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 023986fdd..3bb438efe 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -2133,11 +2133,13 @@ void OperationDialog::cpp_def_from_decl() index1 = index2; } } -// if(!oper->is_abstract) -// { + QList failedTags; for(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); @@ -2165,7 +2167,7 @@ void OperationDialog::cpp_def_from_decl() tagString.chop(1); QMessageBox::critical(0, tr("Warning!"), tr("Could not find correct place for these tags: " + tagString), QMessageBox::Ok); } - //} + // update def cppTab->ui->edCppDefProto->setText(def); diff --git a/src/douml.pro b/src/douml.pro index 6a551d160..aec3e1027 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -550,6 +550,9 @@ QMAKE_CXXFLAGS += -std=gnu++11 LIBS += -L../bin -lUniversalModels RESOURCES += icons.qrc ../douml.qrc +INCLUDEPATH += $${PWD} + + FORMS += \ ui/operationwidgetcpp.ui \ ui/constructorinitializerdialog.ui \ diff --git a/src/tool/snippets.h b/src/tool/snippets.h new file mode 100644 index 000000000..c59f8c5a8 --- /dev/null +++ b/src/tool/snippets.h @@ -0,0 +1,13 @@ +#ifndef _SNIPPETS_H +#define _SNIPPETS_H + +// some really insane code from stackoverflow that allows to shorten lengthy ifs +template +bool operator *(const T0& lhs, const std::array& rhs) { + return std::find(begin(rhs), end(rhs), lhs) != end(rhs); +} + +template std::array in(T0 arg0, T...args) { + return {{arg0, args...}}; +} +#endif \ No newline at end of file diff --git a/src/ui/quickedit.ui b/src/ui/quickedit.ui index 2c6fd5a2f..307235a26 100644 --- a/src/ui/quickedit.ui +++ b/src/ui/quickedit.ui @@ -178,7 +178,7 @@ - + Parameter @@ -188,6 +188,17 @@ + + + + Attribute + + + + :/root/icons/bullet_add.png:/root/icons/bullet_add.png + + + From 3120af00ffdbd7af4d519287eccee6009fab5087 Mon Sep 17 00:00:00 2001 From: zeks Date: Fri, 10 May 2013 03:53:31 +0400 Subject: [PATCH 075/297] Buttons for clipboard and quickEdit on main toolbar --- bin/settings.ini | 2 +- src/CustomWidgets/quickedit.cpp | 10 +++++ src/CustomWidgets/quickedit.h | 1 + src/diagram/UmlWindow.cpp | 42 ++++++++++++++++-- src/diagram/UmlWindow.h | 5 +++ src/icons.qrc | 2 + src/icons/date_empty.png | Bin 0 -> 1721 bytes src/icons/note_edit.png | Bin 0 -> 1995 bytes src/icons/photo_edit.png | Bin 0 -> 1901 bytes src/misc/ClipboardManager.cpp | 75 ++++++++++++++++++++++++++++++++ src/misc/ClipboardManager.h | 15 ++++++- 11 files changed, 146 insertions(+), 6 deletions(-) create mode 100644 src/icons/date_empty.png create mode 100644 src/icons/note_edit.png create mode 100644 src/icons/photo_edit.png diff --git a/bin/settings.ini b/bin/settings.ini index 8d4bd6b5d..fe6fe87d5 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,7 +10,7 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Generate XMI 1.2,Generate .pro" [headers] -quickedit=@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6g\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\0›\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0) +quickedit=@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6p\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\0¤\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0) [quickedit_checkboxes] cpp=true diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 7ec6999e6..281ce67c2 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -640,6 +640,16 @@ void QuickEdit::Show(BrowserNode * node) } +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("settings.ini", QSettings::IniFormat); diff --git a/src/CustomWidgets/quickedit.h b/src/CustomWidgets/quickedit.h index 1cf871668..7256af6df 100644 --- a/src/CustomWidgets/quickedit.h +++ b/src/CustomWidgets/quickedit.h @@ -37,6 +37,7 @@ class QuickEdit : public QWidget ~QuickEdit(); void Init(UmlWindow* window, BrowserView* view); void Show(BrowserNode*); + bool ValidType(BrowserNode*); protected: void closeEvent(QCloseEvent *) override; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 215cbb690..3863f76af 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -106,6 +106,7 @@ #include "browsersearch.xpm" #include "misc/ClipboardManager.h" #include "ui/catalogwidget.h" +#include "tool/snippets.h" #include #include #include @@ -249,6 +250,7 @@ CreateToolButton( 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; @@ -306,21 +308,28 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) - prev = CreateToolButton(*leftPixmap, - this, SLOT(prev_select()), projectTools, "previous selected"); + prev = CreateToolButton(*leftPixmap, this, SLOT(prev_select()), projectTools, "previous selected"); Q3WhatsThis::add(prev, prevText()); - next = CreateToolButton(*rightPixmap, - this, SLOT(next_select()), projectTools, "next selected"); + next = CreateToolButton(*rightPixmap, this, SLOT(next_select()), projectTools, "next selected"); Q3WhatsThis::add(next, nextText()); Q3WhatsThis::add(projectOpen, projectOpenText()); Q3WhatsThis::add(projectSave, projectSaveText()); + + tbClipboard = CreateToolButton(QIcon(":/root/icons/date_empty.png").pixmap(), + this, SLOT(OnCallClipboardMenu()), projectTools, "Call clipboard"); + tbQuickEdit = CreateToolButton(QIcon(":/root/icons/photo_edit.png").pixmap(), + 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?"); + + generateLabel = new QLabel(tr("Generate:")); QFont font = generateLabel->font(); font.setBold(true); @@ -484,6 +493,7 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) wdgCatalog = new CatalogWidget; quickEdit = new QuickEdit(); browser = new BrowserView(); + connect(browser, SIGNAL(currentChanged(Q3ListViewItem*)), this, SLOT(OnChooseQuickEditMode(Q3ListViewItem*))); wdgCatalog->Init(this, browser); connect(wdgCatalog, SIGNAL(markedRemove(QString,int)), browser, SLOT(OnUnmarkItem(QString,int))); @@ -491,6 +501,7 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) quickEdit->Init(this, browser); + quickEdit->setWindowFlags(Qt::WindowStaysOnTopHint); sh1 = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_E),this, SLOT(OnShowQuickEdit()),SLOT(OnShowQuickEdit()), Qt::ApplicationShortcut); @@ -2363,6 +2374,23 @@ void UmlWindow::OnPickSelectionFromItem(const QModelIndex & current, const QMode itemAsNode->select_in_browser(); } +void UmlWindow::OnChooseQuickEditMode(Q3ListViewItem* item) +{ + if(!item) + return; + //TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); +// if(!itemAsInterface) +// return; + BrowserNode* itemAsNode = static_cast(item); + if(!itemAsNode) + return; + if(quickEdit->ValidType(itemAsNode)) + tbQuickEdit->setEnabled(true); + else + tbQuickEdit->setEnabled(false); + +} + void UmlWindow::OnShowQuickEdit() { if(quickEdit->isVisible()) @@ -2371,6 +2399,12 @@ void UmlWindow::OnShowQuickEdit() quickEdit->OnShow(); } +void UmlWindow::OnCallClipboardMenu() +{ + An clipboard; + clipboard->GetMenuInstance()->popup(QCursor::pos()); +} + void UmlWindow::whats_this() const { QWhatsThis::enterWhatsThisMode(); diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index fb5518c73..a0fca1cc0 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -128,6 +128,8 @@ class UmlWindow : public QMainWindow char style; // '?' unknown, 'm' = motif, '+' = motif+, 'w' = windows QToolButton * prev; QToolButton * next; + QToolButton * tbClipboard = nullptr; + QToolButton * tbQuickEdit = nullptr; Q3ValueList select_historic; public: @@ -271,7 +273,10 @@ private slots: public slots: void whats_this() const; void OnPickSelectionFromItem(const QModelIndex&,const QModelIndex& ); + void OnChooseQuickEditMode(Q3ListViewItem *item); void OnShowQuickEdit(); + void OnCallClipboardMenu(); + //void OnCallQuickEdit(); }; diff --git a/src/icons.qrc b/src/icons.qrc index dd57b47fe..c85dec2e1 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -13,5 +13,7 @@ icons/up.png icons/bullet_add.png icons/arrow_refresh.png + icons/date_empty.png + icons/photo_edit.png diff --git a/src/icons/date_empty.png b/src/icons/date_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..66fa2a3965959dcf772414c219042cc158e4a81f GIT binary patch literal 1721 zcmV;q21fabP)+_-T=0f1#Oi=D<#i9Rckw61zk41re z(XX^ZKL2F7XVR=WW4>(+06tLY^_d}Aqz zxrdnRVBxrQf)>M*%6@qN=yuqDNV^&QtA%|KM{8a&(BVQTrx`hO!raCY+>6Od#ms0S zAg;4C7_)DD1I8ST3s%1_T9^xCTTGK-i~!*1YQ)1a+$3;q0!gg_2W=RJA=m0(9{^Aj z2FD26hm)Ys1U7~w-G1sKtVQulgKT^{S%bUZW)s|Je{1+p)gemL~Gk z%D6IJu%$t|-6H^6Es^gZVe6bfyPG?+&>1fkC+DxcBXdhj(km2=&~_vN5)*KAGM^TQ zsluFTKH-z8Ys3ayoj|HvTaw0_zizL|pFjT~QNAcA&dtlMZ@=lv?(Sg#?ZTLR{>xpt zTdjN9@R=>W<%=xH7VxDWPE&Ff?iKj>GVtYciXm=4F0@S3bo=%CkR?Y02pC1 znN$nHFcjxGB7M;xZO6VWIoeASiA3bOt^`4#kdrn7`M+;UrlHg69GXL*!vGMmL8oMa zS1J*JakOhZ0)b)D( z*j}KSN}`>^0 z_l%T!w8b@rLP0&>+}u1+XU8Kg-i#-$>({TVd{Keal0HVqC>SXj(LLg69a68;>7Xr+ zk>WJzhppyN4P3i+&ECZ;a(Q`K=H}+);>C-PD_i&QQQMD>c-5VgEYK+(qOR0)UibF) zn0r-7VAntNVL}573k!3XE?v5M^XARjYPEWHadGi2MBkg4nJLfC&e~IWRZmPz$n^BI zazJ6ewL=}TE-j_%yKvkp)Xi3h^#3gmalE_`kr2S6QwA?G3I z*v{hv5znB-czzO+jZfS`44O{rJY2|qDOGi@OT zmWv$`aD|b@fSiG2XDtR5=ua_SKQi*>B|mTnKA6nseSv8)UiIhse*z2u$K++MhX~ty P00000NkvXXu0mjf=Q28Q literal 0 HcmV?d00001 diff --git a/src/icons/note_edit.png b/src/icons/note_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..206ef21e4c822929014b89c6506628732998bf54 GIT binary patch literal 1995 zcmV;+2Q>JJP)4)$5>WZQw1hJurE>hC0~SRHh$Vi&TMEo&fm{-BbA4h4 z2m}D18!!zZ5#@V%AjJ9Y16Rm^`0!N%{uK3Tu+kZrc@K1@0;pOFq_YxKlKUz_RPYU( z%Cc!-B@vsPOFUFM#`Q9uALm}S2p1GS{Q?CrYeRJhpc)ihQAa_vrjp=t86NQh9; zP=rl^DgL&}l0r5rs<_ABb0$#cD-wWBMR^Luwg&lLqgp}8qq=c9n76cCS-ej$X92xDP!hWmbx^nZz4#)gl-4Wob!F1pA^ z@E*EzCRuC@P)j8RsAR#WG>cZ%P*9E(m^_hU3{+6~%&he94C5fcSv9451S`TtIf9DK z0oBz-GGJ1$P5~M%Q>e5mASri~dM{5@F}f2J>~hJ#6hWtPJt2bACsVM7>=^{Jq=xT! zi*-SQg6CHhNqu1ugu)X>Uj7tTYl1DZlch3`TUza-LW5_QR?8R?t||(E>Xo!RA$jrO zx-MAoOJH7)oc*QJT^WMQ7;@c3Kpu|-Srh=vS_tY(59@-N3JlV(GB^WtT`863ax!x~ zG-i0B$RNyfSJ$Z<~3_~KJ&eY z{~YiK)am+?Tz{&6FSq`<;DS$2k_GV+>4fmHy9gk*Qv=8bb-`dpMR~DBbo^3myM6Ab z_iVWLugwkDs1qY&D2wIXx7={!A8xvS?e+x#V*|X|!u;Zu1x7@8fg9}#K#&E^C9@!# zk%g+B_s7|BOzzp$^w7J1FMss-zz|}IG&H8mG;gi4b7|bay6wdU7c?->I}ZVU1Y*+q znnqyRa+!9*vPC-vhbfT}bT>*lA2qilPyv^Lb) z37hVC^@&My#}oVPQ0!iP6X^*JccCs&`QrlqA6*N3@0*`sdLqVhoI%{KMKqQ~_}F)` z^R5hPt7XZ(q;6Z*5RG*r_!;jJdo5bF_;9B8BZPy%t>2P2>W4>Q9X}5B8<=~k zv7}=6iF0AeKs27g<}J4`2<;ur;PAdY48CkvJ3JYeG#(mbXLLkCO#LQWZ`Lu=(}nOb zmA3%nXV|Q;Nx7pL>Q!;kTSWf#UJ$#xqX}7vMBn!P?OUGh=;&AwnwsoE)-W-fkOfB+ znE&bS6luB2mEyRH$`vlb^qFqBQ--h+gGZ+naq4zTzo7OQS z7>wi7z$$8Z=P(=85Ai08-S*Y>l&gOEI_3z4LYwd0y0z!@;Hh=Bbv01avcD@77W&uX ztSS<+Xk1jjIl=w0*&A?ETNZ4A+u+q-wRzHTWR8!HfIZI~OSODHf!y3={tiscAEW481Sl_NlK(eV?A z@Z9EBo~OHdz5u?#bCDCklZSA)cM?CGB%@ti|2I=Tp0d9h0LRS!{eQdd=zHC`v84@D zOrh))uUJc#SKTig6ib(>X}Y%IgWht)<FU1N(y*m7JpGWa?Z$@bfqD`jOMvwpblg z#6Kfm8uPAD0)evpvK7nk{_Xv9ubH7?uT9!28i<+-S2gj@;CDX_=Ke#okK_4|M7nJ z_|S9Wig9Ebmv2fht}AoSGe5?@>P1b{HvaylSJVij?|5go(RuRI|IDPVgPFNhJGamB zDHs3r_~abJOh^9wY+o1y#s8~yxmpdw*a+E9h8-ospr~VY&M_n-S`Mdsu$|eG9&lpd d>m2_TU;taS0HE?5mE8aU002ovPDHLkV1m))$o&8S literal 0 HcmV?d00001 diff --git a/src/icons/photo_edit.png b/src/icons/photo_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..f16e8a8af756f32dc48e3a0256720a11617884ab GIT binary patch literal 1901 zcmV-z2a@=SP)?1vN%cBPPZl8e{Z_8Z{>Fi3^6Hk+|?fQENF{`}XZyEzgjpm;l(@+S*K6Y$lUQQ3EFWBg`! zu6K@6rtS>}gQm~t+oO6taI{z~24Mk2D~sXr{5c(oM6B`LChSc6*7g51R#jC6VQ6-C zUS9+?Dk>^0RIRP8m^*ha!~*p6^dKA#L#(xg5lC5CnYEr{1R)k$AlZawh&!w`H8nL< zhQo&sW7e!$*s)`WwMN)2%mbj-ghHY0LT!bGg%&FWM8$kM8t&Q&ne zyK{_+)N-=IZ`+vcJKbXio2(-^dv8`(fg=ViZk&Stt|=fD$US6oW2H$Oc1&Q}9f*JI9o21w-YWS8Fw9bc_HvZpTkD4}dJp@|+uFs$8k2GN<49O)xsg zt}0hcn6d%o3j6-1$`T&Y*rIjqdG#Ce`B`zR-!Oge)QP8ZCioNLsN zPU`ht{jP3MnT&qs0ozSX=lKlCCU-8~xh~Pz$fZ8l?`pNmn4Fx%oH=u>`LVGvudH$B zF(BvDtxPb9sO8RxSE0GotKV~(P#KhYdT`Ksuc)a>$hu@60Hh6E2w>&2s_sJvXv5Se(hld8TufICFtg|JV6XA{I~MOeBNl z3l<~VJ%Fy)KP|h~xAMl9AKJ8G8UrkyWX-8at#kTal~AF^gvN*h`;&GWl|gJuYJ)d| z`&-&jx$6WH$pmg}T;^_Ac;Tzdn=a`s$PF}AOhqgrDpZ+ZF4s9d5d^~Or|Uf)H^O4| ziCzQGZYagK?*RJ)gNTRIC@e3-p{_2N{t?{1WW`$^M`m*=y?jngOjwF}M_^%5YgyH1 zstwZUp z7{1whFV^1n271SC#+vhHh8IJaWfBhGScDWHYhw{N#-rXuF>($dl_fRd6D{98+e zK1Wg2FYxc~$51bD^(wi9#9zVd4<^y^(@|^-oP!^`Q*WQ+t=c;6MnomFFc1h>ENDdY zSUPh8L9)y;ZU{0KjiR!8HcrV=A3DAXD;Bv= z^t=-7C1sTeg@Lg{>u}kkPjLE76%PIG#x*ToB+LQ~PZ(&B`_G4O0S8O2!u3yYLy-}@ zZpLCXZ{9rY+__T%sS+(ME!j-QLgLJZWQ)Mq28YAwKkz7)FZme9{Xk!T2y1=kBbuti z$>C#Y_QdePd&M|fy$Ws5Z$)_I6ymW+aUK8$8smUZTG`RjVVwvnYiw*pRQyapq@U|7 z`VB7*b{@c;t3Jk9qyPhb2G(2-L?iv!*VB)y1mpg87bX|pgvXxSBKQ7DQCLDlvR5*X z(Ag+g@F&-=Uyse3H(S?m@pp_>OX8qFEY3&{$cSq)_7BPwOR4~fNtFxuF1@9p)wjIS z2>guISIVvWj415}mWlF#1Hj{7cu};p5J#Tah%*BxaY@Tk9$Q{YZ;<{S^X9qI7unAQ zlcMw>GplB0J66bf#Qx@A3UAS;p4{;0yX)_Nc&#ybDHha(aQK)A5(y!3$9?Z(*N?q; z(OzF`Gak2PcS+yPfg!t}ZS&ZGcs9+;m(|xdUNj%=-LK;0(Kk^Y>B7OG2%h;0Uv~I$ z^VtaduWj1(J(+UVA<>Pwb1ueDy$@k%setText(text); } +void ClipboardManager::OnPutItemIntoClipboardRequested() +{ + QAction * senderAction = qobject_cast(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 { + text.left(15); + itemText = text + "..."; + } + + 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 66e49cb3b..8efa7cbc8 100644 --- a/src/misc/ClipboardManager.h +++ b/src/misc/ClipboardManager.h @@ -25,6 +25,7 @@ #define CLIPBOARDMANAGER_H #include +#include #include #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 From 399c86d55cb12880c5579aa23f3aeb7f5ae18fe4 Mon Sep 17 00:00:00 2001 From: pasgui Date: Fri, 10 May 2013 10:22:57 +0200 Subject: [PATCH 076/297] Fixes settings configuration --- src/CustomWidgets/quickedit.cpp | 4 ++-- src/data/OperationData.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 281ce67c2..abc5428a1 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -615,7 +615,7 @@ void QuickEdit::Show(BrowserNode * node) }; TreeFunctions::ExpandAllSatisfying(check, ui->tvEditor, treeModel, QModelIndex()); - QSettings settings("settings.ini", QSettings::IniFormat); + 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()) @@ -652,7 +652,7 @@ bool QuickEdit::ValidType(BrowserNode * node) void QuickEdit::closeEvent(QCloseEvent *) { - QSettings settings("settings.ini", QSettings::IniFormat); + QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); settings.setIniCodec(QTextCodec::codecForName("UTF-8")); if(ui->tvEditor->header()->count() > 0) { diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 5176a4e76..fed2fb0e4 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -3376,7 +3376,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) { From 1c9f4f60231cc878670f437a2e9be1ac3054f5c8 Mon Sep 17 00:00:00 2001 From: pasgui Date: Fri, 10 May 2013 18:50:07 +0300 Subject: [PATCH 077/297] Update README.md update douml link on sourceforge. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad54fb0c9..bf2363945 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ Compiling Webpage ------- - http://sourceforge.net/projects/DoUML/ + http://sourceforge.net/projects/douml/ Contact email: ------------- From 49550aca752d2f6e7aa48bf9015badd57bc495db Mon Sep 17 00:00:00 2001 From: zeks Date: Fri, 10 May 2013 22:44:48 +0400 Subject: [PATCH 078/297] Adds attribute and enum item creation in quick dialog --- src/CustomWidgets/quickedit.cpp | 17 +++++++++-------- src/CustomWidgets/quickeditcontrollersetup.cpp | 11 ----------- src/browser/BrowserAttribute.cpp | 6 ++++++ src/browser/BrowserAttribute.h | 2 +- src/browser/BrowserClass.cpp | 12 ++++++++++++ src/browser/BrowserClass.h | 1 + 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 281ce67c2..db76c7da5 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -115,15 +115,13 @@ void QuickEdit::OnContextMenu(QPoint point) if(!current.isValid()) return; - CreateMenu(); current = current.sibling(current.row(), 0); - - - TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); BrowserNode* currentNode = static_cast(itemAsInterface->InternalPointer()); if(!itemAsInterface) return; + + CreateMenu(); SetupMenu(itemAsInterface); if(currentNode->TypeID() != TypeIdentifier::id()) { @@ -257,7 +255,6 @@ void QuickEdit::SetupMenu(TreeItemInterface * interface) actAfter->setEnabled(true); } interface->childCount() == 0 ? actCollapseExpandSelf->setEnabled(false) : actCollapseExpandSelf->setEnabled(true); - //itemExpanded ? actCollapseExpand->setText(tr("Collapse")) : actCollapseExpand->setText(tr("Expand")); } void QuickEdit::SetupItemCreationFuncs() @@ -455,7 +452,11 @@ void QuickEdit::AddAttribute() return; //classNode->addOperation() - BrowserAttribute* newAttribute = static_cast(classNode->addAttribute()); + BrowserAttribute* newAttribute; + if(QString(classNode->get_stereotype()) == "enum") + newAttribute = static_cast(classNode->addEnumItem()); + else + newAttribute = static_cast(classNode->addAttribute()); QModelIndex parentIndex; TreeItemInterface* parent; if(treeModel->parent(current).isValid()) @@ -471,13 +472,13 @@ void QuickEdit::AddAttribute() QSharedPointer sharedOfNode = parent->GetChildren()[insertIndex]; - if(!treeModel->insertRows(newItemPosition-1, 1, current)) + if(!treeModel->insertRows(newItemPosition, 1, current)) return; if(!current.isValid()) return; - QModelIndex newItem = treeModel->index(newItemPosition-1,0,current); + QModelIndex newItem = treeModel->index(newItemPosition,0,current); TreeItemInterface *newItemInterface = static_cast(newItem.internalPointer()); TreeItem* newItemAsNode = static_cast*>(newItemInterface); newItemAsNode->SetController(attributeController); diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 833d282a1..4d69316dc 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -179,17 +179,6 @@ void QuickEdit::SetupDelegates() PostfixDelegateSetup(); } -//// some really insane code from stackoverflow that allows to shorten lengthy ifs -//template -//bool operator *(const T0& lhs, const std::array& rhs) { -// return std::find(begin(rhs), end(rhs), lhs) != end(rhs); -//} - -//template std::array in(T0 arg0, T...args) { -// return {{arg0, args...}}; -//} - - #define ADD_GETSET_DATA(TYPE,DATA_TYPE, HOLDER,ROW,ROLES,CONVERTER,ACCESSOR,SETTER) \ HOLDER->AddGetter(ROW,ROLES, \ [] (const BrowserNode* data, const QModelIndex& index) \ diff --git a/src/browser/BrowserAttribute.cpp b/src/browser/BrowserAttribute.cpp index 44d2444d4..0b0f538c4 100644 --- a/src/browser/BrowserAttribute.cpp +++ b/src/browser/BrowserAttribute.cpp @@ -115,6 +115,11 @@ BrowserAttribute::~BrowserAttribute() delete def; } +uint BrowserAttribute::TypeID() +{ + return TypeIdentifier::id(); +} + void BrowserAttribute::clear(bool old) { all.clear(old); @@ -459,6 +464,7 @@ void BrowserAttribute::modified() { repaint(); ((BrowserNode *) parent())->modified(); + def->modified(); if (get_oper != 0) update_get_oper(); diff --git a/src/browser/BrowserAttribute.h b/src/browser/BrowserAttribute.h index 9d8adcdcc..65f764ec0 100644 --- a/src/browser/BrowserAttribute.h +++ b/src/browser/BrowserAttribute.h @@ -62,7 +62,7 @@ class BrowserAttribute : public BrowserNode, public Labeled BrowserAttribute(QString s, BrowserNode * p, AttributeData * d, int id = 0); BrowserAttribute(const BrowserAttribute * model, BrowserNode * p); virtual ~BrowserAttribute(); - + uint TypeID() override; virtual void delete_it(); virtual BrowserNode * duplicate(BrowserNode * p, QString name = QString()); diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 03d9e6eb3..1aa83644a 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1361,6 +1361,18 @@ BrowserNode *BrowserClass::addAttribute() 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) { return add_attribute(attr, enum_item, true); diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index 9a55434f5..c6a160fb7 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -79,6 +79,7 @@ class BrowserClass : public BrowserNode, public Labeled 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, bool sameName = false); From be86cc3709bef6d1fa344e9f02e17a00550ab175 Mon Sep 17 00:00:00 2001 From: zeks Date: Fri, 10 May 2013 23:50:36 +0400 Subject: [PATCH 079/297] fix for relative file path generation --- bin/settings.ini | 2 +- src/CppGenerator/CppGenerator.pro | 2 +- src/CppGenerator/UmlPackage.cpp | 6 ++++-- src/CppGenerator/main.cpp | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/settings.ini b/bin/settings.ini index fe6fe87d5..09f0fdd44 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -10,7 +10,7 @@ encoding=UTF-8 Tools="Import Rose,Uml projection,C++ state machine,Generate XMI 1.2,Generate .pro" [headers] -quickedit=@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6p\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\0¤\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0) +quickedit=@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6Ý\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\x1\x11\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0) [quickedit_checkboxes] cpp=true diff --git a/src/CppGenerator/CppGenerator.pro b/src/CppGenerator/CppGenerator.pro index cb945548a..d6a28e674 100644 --- a/src/CppGenerator/CppGenerator.pro +++ b/src/CppGenerator/CppGenerator.pro @@ -112,7 +112,7 @@ INCLUDEPATH = ../Tools ../CppGenerator ../ #The following line was inserted by qt3to4 -QT += network qt3support testlib console +QT += network qt3support testlib console QMAKE_CXXFLAGS += -std=gnu++11 DESTDIR = ../../bin Release { diff --git a/src/CppGenerator/UmlPackage.cpp b/src/CppGenerator/UmlPackage.cpp index ec46fb477..fe5966872 100644 --- a/src/CppGenerator/UmlPackage.cpp +++ b/src/CppGenerator/UmlPackage.cpp @@ -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().toAscii(); + QByteArray toBa = destdir.absolutePath().toAscii(); + const char * cfrom = fromBa.constData(); + const char * cto = toBa.constData(); int lastsep = -1; int index = 0; diff --git a/src/CppGenerator/main.cpp b/src/CppGenerator/main.cpp index bc066b07f..7b8c0b9b0 100644 --- a/src/CppGenerator/main.cpp +++ b/src/CppGenerator/main.cpp @@ -35,6 +35,7 @@ #include #include "Logging/QsLog.h" #include "Logging/QsLogDest.h" +#include int main(int argc, char ** argv) { #ifdef DEBUG @@ -93,10 +94,9 @@ int main(int argc, char ** argv) return 0; } - - if (UmlCom::connect(QString(argv[port_index]).toUInt())) { try { + UmlCom::trace("C++ generator release 2.18
"); UmlCom::traceAutoRaise(FALSE); UmlCom::targetItem()->generate(); From d45be4ed2963a2c7c2327a6b3e274153c2ce6dc0 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 11 May 2013 01:06:50 +0400 Subject: [PATCH 080/297] duplicated items for class, attribute, operation and extra member will appera next to the origin in the listview --- src/browser/BrowserArtifact.cpp | 2 ++ src/browser/BrowserAttribute.cpp | 5 ++++- src/browser/BrowserClass.cpp | 31 ++++++++++++++++++------------ src/browser/BrowserExtraMember.cpp | 3 ++- src/browser/BrowserNode.cpp | 1 + src/browser/BrowserOperation.cpp | 3 ++- src/browser/BrowserRelation.cpp | 3 ++- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/browser/BrowserArtifact.cpp b/src/browser/BrowserArtifact.cpp index ed454d575..efec79a02 100644 --- a/src/browser/BrowserArtifact.cpp +++ b/src/browser/BrowserArtifact.cpp @@ -128,6 +128,8 @@ BrowserNode * BrowserArtifact::duplicate(BrowserNode * p, QString name) result->set_name((name.isEmpty()) ? get_name() : name); result->update_stereotype(); + move(result, this); + result->select_in_browser(); return result; } diff --git a/src/browser/BrowserAttribute.cpp b/src/browser/BrowserAttribute.cpp index 0b0f538c4..3245c8e76 100644 --- a/src/browser/BrowserAttribute.cpp +++ b/src/browser/BrowserAttribute.cpp @@ -97,7 +97,8 @@ BrowserNode * BrowserAttribute::duplicate(BrowserNode * p, 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; } diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 1aa83644a..f9c852906 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1069,7 +1069,12 @@ void BrowserClass::exec_menu_choice(int rank, if (((BrowserNode *) parent())->enter_child_name(name, 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; } @@ -1249,15 +1254,16 @@ BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name) 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) + { + 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)) + if ((rd->get_start_class() != this) || (rd->get_end_class() != this) || rd->is_a((BrowserRelation *) child)) ((BrowserNode *) child)->duplicate(result); } else @@ -2229,13 +2235,14 @@ 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); diff --git a/src/browser/BrowserExtraMember.cpp b/src/browser/BrowserExtraMember.cpp index 99bb883ba..8157c7f29 100644 --- a/src/browser/BrowserExtraMember.cpp +++ b/src/browser/BrowserExtraMember.cpp @@ -89,7 +89,8 @@ BrowserNode * BrowserExtraMember::duplicate(BrowserNode * p, QString name) result->set_name((name.isEmpty()) ? get_name() : name); result->update_stereotype(); - + move(result, this); + result->select_in_browser(); return result; } diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index df32a47c7..c7d62e281 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -984,6 +984,7 @@ void BrowserNode::mark_menu(Q3PopupMenu & m, const char * s, int bias) const if (after) m.setWhatsThis(m.insertItem(TR("Move marked after"), bias + 4), TR("to move the marked items after %1", s)); + m.insertSeparator(); } } diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp index 11ae3c4c0..ce0997fa6 100644 --- a/src/browser/BrowserOperation.cpp +++ b/src/browser/BrowserOperation.cpp @@ -145,7 +145,8 @@ BrowserNode * BrowserOperation::duplicate(BrowserNode * p, QString n) result->set_name(n); result->update_stereotype(); - + move(result, this); + result->select_in_browser(); return result; } diff --git a/src/browser/BrowserRelation.cpp b/src/browser/BrowserRelation.cpp index 51c9768fc..688dbde0b 100644 --- a/src/browser/BrowserRelation.cpp +++ b/src/browser/BrowserRelation.cpp @@ -112,7 +112,8 @@ BrowserNode * BrowserRelation::duplicate(BrowserNode * p, QString) } result->update_stereotype(); - + move(result, this); + result->select_in_browser(); return result; } From 47ef58d01c46253da405fe7e62ae41a4e449874e Mon Sep 17 00:00:00 2001 From: pasgui Date: Sun, 12 May 2013 07:51:02 +0200 Subject: [PATCH 081/297] fixes desktop file --- Makefile | 3 +- src/settings_ini.h | 124 ++++++++++++++++++++++----------------------- 2 files changed, 64 insertions(+), 63 deletions(-) diff --git a/Makefile b/Makefile index e3fece6a2..7c040eccf 100644 --- a/Makefile +++ b/Makefile @@ -130,11 +130,12 @@ install: 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=$(DEB_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;" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \ + echo "Categories=Development;Building;GUIDesigner;IDE;Documentation;" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \ fi uninstall: diff --git a/src/settings_ini.h b/src/settings_ini.h index 40d2039ee..548208b75 100644 --- a/src/settings_ini.h +++ b/src/settings_ini.h @@ -23,71 +23,71 @@ unsigned char settings_ini[] = { 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x67, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0xc3, 0xbf, 0xc3, 0xbf, 0xc3, - 0xbf, 0xc3, 0xbf, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0xc2, 0x81, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0xc2, - 0x9b, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0xc3, 0x9d, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x22, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x2e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x3e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x78, 0x33, 0x37, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x2b, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x4c, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x35, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, - 0x34, 0x32, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x78, 0x31, 0x64, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0xc3, 0xbf, 0xc3, 0xbf, + 0xc3, 0xbf, 0xc3, 0xbf, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0xc2, 0x81, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, + 0x31, 0x5c, 0x78, 0x31, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x32, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x35, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x23, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x24, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x28, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2e, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x21, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, - 0x34, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x22, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x3e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x37, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2b, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x4c, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x35, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x2d, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, + 0x78, 0x36, 0x34, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x34, 0x32, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x64, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x32, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x78, 0x33, 0x38, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x69, 0x5c, 0x30, 0x5c, + 0x78, 0x33, 0x35, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x23, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x24, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x28, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x2e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x21, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x78, 0x34, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2d, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, + 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x38, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x29, 0x0a, 0x0a, 0x5b, 0x71, 0x75, 0x69, 0x63, 0x6b, 0x65, - 0x64, 0x69, 0x74, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x6f, 0x78, - 0x65, 0x73, 0x5d, 0x0a, 0x63, 0x70, 0x70, 0x3d, 0x74, 0x72, 0x75, 0x65, - 0x0a, 0x6a, 0x61, 0x76, 0x61, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, - 0x70, 0x68, 0x70, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x70, 0x79, - 0x74, 0x68, 0x6f, 0x6e, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x69, - 0x64, 0x6c, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a, 0x0a, 0x5b, 0x77, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5d, 0x0a, 0x73, 0x69, 0x7a, 0x65, 0x3d, - 0x40, 0x53, 0x69, 0x7a, 0x65, 0x28, 0x2d, 0x31, 0x20, 0x2d, 0x31, 0x29, - 0x0a + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, + 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, + 0x69, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, + 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x29, 0x0a, 0x0a, 0x5b, 0x71, 0x75, + 0x69, 0x63, 0x6b, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, 0x68, 0x65, 0x63, + 0x6b, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x5d, 0x0a, 0x63, 0x70, 0x70, 0x3d, + 0x74, 0x72, 0x75, 0x65, 0x0a, 0x6a, 0x61, 0x76, 0x61, 0x3d, 0x66, 0x61, + 0x6c, 0x73, 0x65, 0x0a, 0x70, 0x68, 0x70, 0x3d, 0x66, 0x61, 0x6c, 0x73, + 0x65, 0x0a, 0x70, 0x79, 0x74, 0x68, 0x6f, 0x6e, 0x3d, 0x66, 0x61, 0x6c, + 0x73, 0x65, 0x0a, 0x69, 0x64, 0x6c, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, + 0x0a, 0x0a, 0x5b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5d, 0x0a, 0x73, + 0x69, 0x7a, 0x65, 0x3d, 0x40, 0x53, 0x69, 0x7a, 0x65, 0x28, 0x39, 0x32, + 0x37, 0x20, 0x35, 0x39, 0x35, 0x29, 0x0a }; -unsigned int settings_ini_len = 1069; +unsigned int settings_ini_len = 1075; From 54141d437e22081bb8c7666597c5d03be541c1ce Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 12 May 2013 21:00:42 +0400 Subject: [PATCH 082/297] fix for duplicate --- src/browser/BrowserArtifact.cpp | 3 --- src/browser/BrowserAttribute.cpp | 4 ++-- src/browser/BrowserExtraMember.cpp | 4 ++-- src/browser/BrowserNode.cpp | 3 ++- src/browser/BrowserOperation.cpp | 4 ++-- src/browser/BrowserRelation.cpp | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/browser/BrowserArtifact.cpp b/src/browser/BrowserArtifact.cpp index efec79a02..0c374d812 100644 --- a/src/browser/BrowserArtifact.cpp +++ b/src/browser/BrowserArtifact.cpp @@ -128,9 +128,6 @@ BrowserNode * BrowserArtifact::duplicate(BrowserNode * p, QString name) result->set_name((name.isEmpty()) ? get_name() : name); result->update_stereotype(); - move(result, this); - result->select_in_browser(); - return result; } diff --git a/src/browser/BrowserAttribute.cpp b/src/browser/BrowserAttribute.cpp index 3245c8e76..fb9908e2f 100644 --- a/src/browser/BrowserAttribute.cpp +++ b/src/browser/BrowserAttribute.cpp @@ -106,8 +106,8 @@ BrowserNode * BrowserAttribute::duplicate(BrowserNode * p, QString name) result->set_name(name); result->update_stereotype(); - move(result, this); - result->select_in_browser(); + //move(result, this); + //result->select_in_browser(); return result; } diff --git a/src/browser/BrowserExtraMember.cpp b/src/browser/BrowserExtraMember.cpp index 8157c7f29..6553fb029 100644 --- a/src/browser/BrowserExtraMember.cpp +++ b/src/browser/BrowserExtraMember.cpp @@ -89,8 +89,8 @@ BrowserNode * BrowserExtraMember::duplicate(BrowserNode * p, QString name) result->set_name((name.isEmpty()) ? get_name() : name); result->update_stereotype(); - move(result, this); - result->select_in_browser(); +// move(result, this); +// result->select_in_browser(); return result; } diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index c7d62e281..524aef9c7 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1133,7 +1133,8 @@ void BrowserNode::mark_management(int choice) if((BrowserNode *) bn->parent() != this) { BrowserNode* nodeCopy = bn->duplicate(this); - move(nodeCopy, 0); + move(nodeCopy, this); + nodeCopy->select_in_browser(); if (nodeCopy->get_type() == UmlAttribute) { diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp index ce0997fa6..6bfb3314e 100644 --- a/src/browser/BrowserOperation.cpp +++ b/src/browser/BrowserOperation.cpp @@ -145,8 +145,8 @@ BrowserNode * BrowserOperation::duplicate(BrowserNode * p, QString n) result->set_name(n); result->update_stereotype(); - move(result, this); - result->select_in_browser(); + //move(result, this); + //result->select_in_browser(); return result; } diff --git a/src/browser/BrowserRelation.cpp b/src/browser/BrowserRelation.cpp index 688dbde0b..14b888c06 100644 --- a/src/browser/BrowserRelation.cpp +++ b/src/browser/BrowserRelation.cpp @@ -112,8 +112,8 @@ BrowserNode * BrowserRelation::duplicate(BrowserNode * p, QString) } result->update_stereotype(); - move(result, this); - result->select_in_browser(); + //move(result, this); + //result->select_in_browser(); return result; } From 493691287fe89881f8679e54df5c0105f716ea14 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 12 May 2013 23:46:15 +0400 Subject: [PATCH 083/297] fixes close on cancel when red X is clicked --- genplugouts/Xmi2Generator/UmlPackage.cpp | 3 +-- genplugouts/usecasewizard/TabDialog.cpp | 1 + .../L_UniversalModels/L_UniversalModels.pro | 3 ++- src/browser/BrowserAttribute.cpp | 6 +++++- src/browser/BrowserClass.cpp | 3 ++- src/browser/BrowserExtraMember.cpp | 6 +++++- src/browser/BrowserOperation.cpp | 6 +++++- src/diagram/UmlWindow.cpp | 18 +++++++++++------- 8 files changed, 32 insertions(+), 14 deletions(-) diff --git a/genplugouts/Xmi2Generator/UmlPackage.cpp b/genplugouts/Xmi2Generator/UmlPackage.cpp index ddfc1d0fc..9c4b3dddf 100644 --- a/genplugouts/Xmi2Generator/UmlPackage.cpp +++ b/genplugouts/Xmi2Generator/UmlPackage.cpp @@ -174,8 +174,7 @@ void UmlPackage::xmi(int argc, char ** argv) search_profiles(profiles); - out << "\n\ -\n #include #include +#include //Added by qt3to4: #include diff --git a/src/Libs/L_UniversalModels/L_UniversalModels.pro b/src/Libs/L_UniversalModels/L_UniversalModels.pro index 6d7010145..60aecb344 100644 --- a/src/Libs/L_UniversalModels/L_UniversalModels.pro +++ b/src/Libs/L_UniversalModels/L_UniversalModels.pro @@ -10,7 +10,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = UniversalModels TEMPLATE = lib -CONFIG+= build_all staticlib +unix:CONFIG+= build_all staticlib +windows:CONFIG+= build_all TARGET = $$qtLibraryTarget(UniversalModels) INCLUDEPATH += include \ diff --git a/src/browser/BrowserAttribute.cpp b/src/browser/BrowserAttribute.cpp index fb9908e2f..74162120b 100644 --- a/src/browser/BrowserAttribute.cpp +++ b/src/browser/BrowserAttribute.cpp @@ -377,8 +377,12 @@ void BrowserAttribute::exec_menu_choice(int rank) break; case 6: - ((BrowserClass *) parent())->duplicate_attribute(this); + { + BrowserNode * attrDuplicate = ((BrowserClass *) parent())->duplicate_attribute(this); + move(attrDuplicate, this); + attrDuplicate->select_in_browser(); return; + } case 7: ReferenceDialog::show(this); diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index f9c852906..4bde0e90f 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1381,7 +1381,8 @@ BrowserNode *BrowserClass::addEnumItem() BrowserNode *BrowserClass::duplicate_attribute(BrowserAttribute *attr, bool enum_item) { - return add_attribute(attr, enum_item, true); + //BrowserNode * attrDuplicate = add_attribute(attr, enum_item, true); + return add_attribute(attr, enum_item, true);; } BrowserNode * BrowserClass::add_extra_member(BrowserExtraMember * em) diff --git a/src/browser/BrowserExtraMember.cpp b/src/browser/BrowserExtraMember.cpp index 6553fb029..d99c2ccdd 100644 --- a/src/browser/BrowserExtraMember.cpp +++ b/src/browser/BrowserExtraMember.cpp @@ -194,8 +194,12 @@ 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) diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp index 6bfb3314e..247a4a046 100644 --- a/src/browser/BrowserOperation.cpp +++ b/src/browser/BrowserOperation.cpp @@ -707,7 +707,11 @@ void BrowserOperation::exec_menu_choice(int rank) case 1: if ((get_of == 0) && (set_of == 0)) - ((BrowserClass *) parent())->duplicate_operation(this); + { + BrowserNode * operDuplicate = ((BrowserClass *) parent())->duplicate_operation(this); + move(operDuplicate, this); + operDuplicate->select_in_browser(); + } ImplBy.clear(); return; diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 3863f76af..03f0cbcf2 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -1236,25 +1236,27 @@ bool UmlWindow::can_close() if (packagePtr) { bool mustBeSaved = BrowserPackage::must_be_saved(); - if (mustBeSaved) { + if (mustBeSaved) + { int result = msg_warning("DoUML", TR("The project is modified, save it ?\n"), QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel); - switch (result) { + switch (result) + { case QMessageBox::Yes: ws->hide(); BrowserPackage::save_all(TRUE); ws->show(); break; - case QMessageBox::Cancel: + case QMessageBox::No: statusBar()->message(TR("Close aborted"), 2000); - return FALSE; + return true; } } } - return TRUE; + return false; } void UmlWindow::set_marked_generation() @@ -1289,9 +1291,10 @@ void UmlWindow::do_close() the->close(); } -void UmlWindow::closeEvent(QCloseEvent *) +void UmlWindow::closeEvent(QCloseEvent *e) { quit(); + e->ignore(); #if 0 if (can_close()) { @@ -1348,7 +1351,8 @@ void UmlWindow::quit() { abort_line_construction(); - if (!BrowserNode::edition_active() && can_close()) { + if (!BrowserNode::edition_active() && can_close()) + { if (browser->get_project() != 0) { save_session(); BrowserView::remove_temporary_files(); From bdd6c21c0c6689d27f71cc7cb2a94aafc20e4e4f Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 12 May 2013 23:57:13 +0400 Subject: [PATCH 084/297] forgot to add text changes --- README.md | 4 ++-- changelog.txt | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bf2363945..d2b425116 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -Built from tag: 1.0b6 +Built from tag: 1.0b7 -DoUML version 1.0b6 +DoUML version 1.0b7 ================== *** IMPORTANT NOTICE *** diff --git a/changelog.txt b/changelog.txt index f000ee5fa..b9ebdbae0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +v1.0b7 + 1. Previously, after "close window" button was clicked and user selected "Cancel" the app closed nevertheless. No longer the case. + 2. Fixed crash when reopening operation window that had different amount of KV-pairs + 3. Duplicated items in tree appear next to their source (valid of class, attribute, operation, extra member) + 4. Settings will now be craeted automatically if there is no file present. + 5. Fixed "relative path" for cpp generation. + 6. Added capability of adding enum items and class attributes to Quickedit window + 7. Added buttons for clipboard access and Quickedit to the toolbar + 8. List of recent projects now lives in settings.ini + 9. Updated "About" dialog and a new icon v1.0b6 1. Import/Export XMI2.1 are working now. Pls test for any possible bugs before fully embracing them. From 7cbbcef297ca025f5c8e515fdce3c293bb34f5bf Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 13 May 2013 04:11:06 +0400 Subject: [PATCH 085/297] app could not be closed :) fixed --- src/diagram/UmlWindow.cpp | 49 +++++++++++++++++++++------------------ src/diagram/UmlWindow.h | 1 + 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 03f0cbcf2..88696bd2e 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -1232,27 +1232,26 @@ bool UmlWindow::saveas_it() bool UmlWindow::can_close() { BrowserPackage * packagePtr = browser->get_project(); + if(!packagePtr) + return true; + bool mustBeSaved = BrowserPackage::must_be_saved(); - 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) + switch (result) { - int result = msg_warning("DoUML", 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; - - case QMessageBox::No: - statusBar()->message(TR("Close aborted"), 2000); - return true; - } + case QMessageBox::Yes: + ws->hide(); + BrowserPackage::save_all(TRUE); + ws->show(); + break; + + case QMessageBox::No: + statusBar()->message(TR("Close aborted"), 2000); + return true; } } @@ -1280,9 +1279,10 @@ void UmlWindow::close() abort_line_construction(); bool editionActive = !BrowserNode::edition_active(); bool canClose = can_close(); - if (editionActive && canClose) + { close_it(); + } } void UmlWindow::do_close() @@ -1294,7 +1294,8 @@ void UmlWindow::do_close() void UmlWindow::closeEvent(QCloseEvent *e) { quit(); - e->ignore(); + if(!quitConfirmed) + e->ignore(); #if 0 if (can_close()) { @@ -1351,7 +1352,9 @@ void UmlWindow::quit() { abort_line_construction(); - if (!BrowserNode::edition_active() && can_close()) + bool canClose = true; + bool editionActive = false; + if ((editionActive = BrowserNode::edition_active() == false) && (canClose = can_close()) == true) { if (browser->get_project() != 0) { save_session(); @@ -1359,9 +1362,11 @@ void UmlWindow::quit() // delete lock set_user_id(-1); } - + quitConfirmed = true; QApplication::exit(0); + return; } + quitConfirmed = canClose; } void UmlWindow::do_quit() diff --git a/src/diagram/UmlWindow.h b/src/diagram/UmlWindow.h index a0fca1cc0..292d8e78e 100644 --- a/src/diagram/UmlWindow.h +++ b/src/diagram/UmlWindow.h @@ -131,6 +131,7 @@ class UmlWindow : public QMainWindow QToolButton * tbClipboard = nullptr; QToolButton * tbQuickEdit = nullptr; Q3ValueList select_historic; + bool quitConfirmed = false; public: UmlWindow(bool batch); From 818c70c779822e4216cc31a84825d41575d8306b Mon Sep 17 00:00:00 2001 From: Sergey Shambir Date: Tue, 14 May 2013 13:09:22 +0400 Subject: [PATCH 086/297] Qmake: fixed linux pro files issues in generators. --- src/CppGenerator/CppGenerator.pro | 2 +- src/CppReverse/{cppreverse.pro => CppReverse.pro} | 0 src/CppRoundtrip/{cpproundtrip.pro => CppRoundtrip.pro} | 0 src/JavaCat/{javacat.pro => JavaCat.pro} | 0 src/JavaReverse/{javareverse.pro => JavaReverse.pro} | 0 src/JavaRoundtrip/{javaroundtrip.pro => JavaRoundtrip.pro} | 0 src/PhpReverse/{phpreverse.pro => PhpReverse.pro} | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename src/CppReverse/{cppreverse.pro => CppReverse.pro} (100%) rename src/CppRoundtrip/{cpproundtrip.pro => CppRoundtrip.pro} (100%) rename src/JavaCat/{javacat.pro => JavaCat.pro} (100%) rename src/JavaReverse/{javareverse.pro => JavaReverse.pro} (100%) rename src/JavaRoundtrip/{javaroundtrip.pro => JavaRoundtrip.pro} (100%) rename src/PhpReverse/{phpreverse.pro => PhpReverse.pro} (100%) diff --git a/src/CppGenerator/CppGenerator.pro b/src/CppGenerator/CppGenerator.pro index d6a28e674..b0440b4eb 100644 --- a/src/CppGenerator/CppGenerator.pro +++ b/src/CppGenerator/CppGenerator.pro @@ -112,7 +112,7 @@ INCLUDEPATH = ../Tools ../CppGenerator ../ #The following line was inserted by qt3to4 -QT += network qt3support testlib console +QT += network qt3support testlib QMAKE_CXXFLAGS += -std=gnu++11 DESTDIR = ../../bin Release { diff --git a/src/CppReverse/cppreverse.pro b/src/CppReverse/CppReverse.pro similarity index 100% rename from src/CppReverse/cppreverse.pro rename to src/CppReverse/CppReverse.pro diff --git a/src/CppRoundtrip/cpproundtrip.pro b/src/CppRoundtrip/CppRoundtrip.pro similarity index 100% rename from src/CppRoundtrip/cpproundtrip.pro rename to src/CppRoundtrip/CppRoundtrip.pro diff --git a/src/JavaCat/javacat.pro b/src/JavaCat/JavaCat.pro similarity index 100% rename from src/JavaCat/javacat.pro rename to src/JavaCat/JavaCat.pro diff --git a/src/JavaReverse/javareverse.pro b/src/JavaReverse/JavaReverse.pro similarity index 100% rename from src/JavaReverse/javareverse.pro rename to src/JavaReverse/JavaReverse.pro diff --git a/src/JavaRoundtrip/javaroundtrip.pro b/src/JavaRoundtrip/JavaRoundtrip.pro similarity index 100% rename from src/JavaRoundtrip/javaroundtrip.pro rename to src/JavaRoundtrip/JavaRoundtrip.pro diff --git a/src/PhpReverse/phpreverse.pro b/src/PhpReverse/PhpReverse.pro similarity index 100% rename from src/PhpReverse/phpreverse.pro rename to src/PhpReverse/PhpReverse.pro From 7ed3c98e568d25e466a9632648e89959a9c0d8c8 Mon Sep 17 00:00:00 2001 From: Sergey Shambir Date: Tue, 14 May 2013 14:37:14 +0400 Subject: [PATCH 087/297] Replaced Q3FileDialog with QFileDialog for better look&feel on Ubuntu Also fixed unused variable warning. --- src/diagram/UmlWindow.cpp | 141 +++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 71 deletions(-) diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index 88696bd2e..c954740fa 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -47,7 +47,6 @@ #endif #include #include -#include #include #include #include @@ -60,6 +59,7 @@ #include #include #include +#include //#include //#include @@ -125,10 +125,6 @@ void set_template_project(QString s) TemplateProject = s; } -// - -static int Counter; - UmlWindow * UmlWindow::the; QString projectNewText() @@ -918,35 +914,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"), + 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); } } } @@ -969,7 +966,8 @@ 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 BoUML project file"), last_used_directory(), QLatin1String("*.prj")); if (!fn.isEmpty()) { set_last_used_directory(fn); @@ -1179,53 +1177,55 @@ 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; + + 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()); - if (!f.isEmpty()) { - set_last_used_directory(f); + if (!f.isEmpty()) { + set_last_used_directory(f); - QDir d(f); + QDir d(f); - if (d.dirName() == "empty") - msg_critical("Error", TR("'empty' is reserved to the empty plug-out")); - else { - QDir di; + if (d.dirName() == "empty") + msg_critical("Error", TR("'empty' is reserved to the empty plug-out")); + else { + QDir di; - while (!di.mkdir(f)) { - if (msg_critical("Error", TR("Cannot create directory\n") + f, - QMessageBox::Retry, QMessageBox::Abort) - != QMessageBox::Retry) { - if (!strcmp(the->browser->get_project()->get_name(), "empty")) - exit(0); + while (!di.mkdir(f)) { + if (msg_critical("Error", TR("Cannot create directory\n") + f, + QMessageBox::Retry, QMessageBox::Abort) + != QMessageBox::Retry) { + if (!strcmp(the->browser->get_project()->get_name(), "empty")) + exit(0); - return FALSE; - } + return false; } + } - QApplication::setOverrideCursor(::Qt::waitCursor); - di.cd(f); - the->ws->hide(); + QApplication::setOverrideCursor(::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->setCaption("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(), "empty")) + exit(0); + else + return false; } - - return FALSE; + return false; } @@ -1797,9 +1797,8 @@ void UmlWindow::edit_env() 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; From 1536cf82d58957c554701624bce3d6a00eabadd6 Mon Sep 17 00:00:00 2001 From: zeks Date: Tue, 14 May 2013 19:42:52 +0400 Subject: [PATCH 088/297] this SHOULD fix close problem... --- src/diagram/UmlWindow.cpp | 175 ++++++++++++++++++++------------------ 1 file changed, 91 insertions(+), 84 deletions(-) diff --git a/src/diagram/UmlWindow.cpp b/src/diagram/UmlWindow.cpp index c954740fa..249a74968 100644 --- a/src/diagram/UmlWindow.cpp +++ b/src/diagram/UmlWindow.cpp @@ -236,11 +236,11 @@ static QString completionText() 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); @@ -277,28 +277,28 @@ 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"); + = CreateToolButton(printIcon, + this, SLOT(print()), projectTools, "print diagram"); Q3WhatsThis::add(diagramPrint, diagramPrintText()); #endif QPixmap searchIcon = QPixmap(browsersearch); QToolButton * browserSearch - = CreateToolButton(searchIcon, - this, SLOT(browser_search()), projectTools, "browser search"); + = CreateToolButton(searchIcon, + this, SLOT(browser_search()), projectTools, "browser search"); Q3WhatsThis::add(browserSearch, browserSearchText()); @@ -321,8 +321,8 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) 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(), + this, SLOT(whats_this()), projectTools, "Whats's this?"); @@ -357,38 +357,38 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) this, SLOT(langMenuAboutToShow())); use_cpp_id = - langMenu->insertItem(TR("C++ management and default declaration/definition"), this, SLOT(use_cpp())); + 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->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_php_id = - langMenu->insertItem(TR("Php management and default definition"), this, SLOT(use_php())); + 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()); use_python_id = - langMenu->insertItem(TR("Python management and default definition"), this, SLOT(use_python())); + 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()); use_idl_id = - langMenu->insertItem(TR("Idl management and default declaration"), this, SLOT(use_idl())); + 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()); langMenu->insertSeparator(); verbose_gen_id = - langMenu->insertItem(TR("Verbose code generation"), this, SLOT(verbose())); + langMenu->insertItem(TR("Verbose code generation"), this, SLOT(verbose())); langMenu->setWhatsThis(verbose_gen_id, verboseText()); preserve_bodies_id = - langMenu->insertItem(TR("Preserve operations's body"), this, SLOT(preserve())); + langMenu->insertItem(TR("Preserve operations's body"), this, SLOT(preserve())); langMenu->setWhatsThis(preserve_bodies_id, preserve_bodiesText()); add_operation_profile_id = - langMenu->insertItem(TR("Add operation profile on body edition"), this, - SLOT(addoperationprofile())); + 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); @@ -398,14 +398,14 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) this, SLOT(miscMenuAboutToShow())); show_browser_stereotypes_id = - miscMenu->insertItem(TR("Show s&tereotypes in browser"), this, - SLOT(show_stereotypes())); + 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()); completion_id = - miscMenu->insertItem(TR("Completion in dialog"), this, - SLOT(do_completion())); + miscMenu->insertItem(TR("Completion in dialog"), this, + SLOT(do_completion())); miscMenu->setItemChecked(completion_id, TRUE); @@ -461,14 +461,14 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) miscMenu->insertSeparator(); shortcut_id = - miscMenu->insertItem(TR("Edit shortcuts"), this, SLOT(edit_shortcuts())); + miscMenu->insertItem(TR("Edit shortcuts"), this, SLOT(edit_shortcuts())); menuBar()->insertSeparator(); miscMenu->insertItem(TR("Set environment"), this, SLOT(edit_env())); img_root_dir_id = - miscMenu->insertItem(TR("Set images root dir"), this, SLOT(edit_image_root_dir())); + miscMenu->insertItem(TR("Set images root dir"), this, SLOT(edit_image_root_dir())); Q3PopupMenu * help = new Q3PopupMenu(this); menuBar()->insertItem(TR("&Help"), help); @@ -568,15 +568,15 @@ UmlWindow::UmlWindow(bool ) : QMainWindow(0, "DoUML", Qt::WDestructiveClose) 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; - } + const QString line = settings.value(tr("File%1").arg(i)).toString(); + if(!line.isEmpty()) + { + historic.append(line); + } + else + { + break; + } } settings.endGroup(); @@ -879,7 +879,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(); @@ -997,15 +997,15 @@ void UmlWindow::historic_add(QString fn) 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; - } + QString s; + if(i < the->historic.size()) + { + settings.setValue(tr("File%1").arg(i+1), the->historic.at(i)); + } + else + { + break; + } } settings.endGroup(); } @@ -1111,8 +1111,8 @@ void UmlWindow::load(QString fn, bool forcesaveas) if (!new_st.isEmpty()) m = "The class stereotype enum_pattern is renamed " + new_st + - "and the classes having the stereotype enum_pattern have now the stereotype " + - new_st + "

" + m; + "and the classes having the stereotype enum_pattern have now the stereotype " + + new_st + "

" + m; if (must_save_as) m += "A save-as is forced now to save the result in a new project"; @@ -1199,7 +1199,7 @@ bool UmlWindow::saveas_it() while (!di.mkdir(f)) { if (msg_critical("Error", TR("Cannot create directory\n") + f, QMessageBox::Retry, QMessageBox::Abort) - != QMessageBox::Retry) { + != QMessageBox::Retry) { if (!strcmp(the->browser->get_project()->get_name(), "empty")) exit(0); @@ -1235,6 +1235,9 @@ bool UmlWindow::can_close() if(!packagePtr) return true; bool mustBeSaved = BrowserPackage::must_be_saved(); + if(!mustBeSaved) + return true; + if (mustBeSaved) { @@ -1252,10 +1255,14 @@ bool UmlWindow::can_close() case QMessageBox::No: statusBar()->message(TR("Close aborted"), 2000); return true; + case QMessageBox::Cancel: + { + statusBar()->message(TR("Close aborted"), 2000); + return false; + } } } - - return false; + return true; } void UmlWindow::set_marked_generation() @@ -1696,27 +1703,27 @@ void UmlWindow::use_idl() 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() @@ -1878,11 +1885,11 @@ void UmlWindow::setFontSize(int i) 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", + 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(); @@ -1935,11 +1942,11 @@ void UmlWindow::setFormat(int i) 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", + TR("Project file is read-only, default " + "format will not be saved, continue ?\n"), + QMessageBox::Yes, QMessageBox::No) + != QMessageBox::Yes)) return; format = (CanvasFormat) i; @@ -2032,8 +2039,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() @@ -2044,8 +2051,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() @@ -2056,8 +2063,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() @@ -2068,8 +2075,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() @@ -2220,11 +2227,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); @@ -2387,8 +2394,8 @@ void UmlWindow::OnChooseQuickEditMode(Q3ListViewItem* item) if(!item) return; //TreeItemInterface *itemAsInterface = static_cast(current.internalPointer()); -// if(!itemAsInterface) -// return; + // if(!itemAsInterface) + // return; BrowserNode* itemAsNode = static_cast(item); if(!itemAsNode) return; From 32c6e5c961d4f1ffb19914d99bf3c6883833e9a0 Mon Sep 17 00:00:00 2001 From: zeks Date: Thu, 16 May 2013 21:16:41 +0400 Subject: [PATCH 089/297] 1. Fixed the crash that could occur if the user closed quick edit while editing param type 2. Attribute and operations added through quick edit now appear at their proper places in main tree view 3. Fixed operation propagation that got broken during previous releases --- changelog.txt | 7 +++++++ src/CustomWidgets/quickedit.cpp | 5 ++++- src/browser/BrowserNode.cpp | 4 ++-- src/browser/BrowserNode.h | 2 +- src/data/OperationData.cpp | 32 ++++++++++++++++++++++++-------- 5 files changed, 38 insertions(+), 12 deletions(-) diff --git a/changelog.txt b/changelog.txt index b9ebdbae0..bbaa46713 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +v1.0b7.1 + 1. Fixed the crash that could occur if the user closed quick edit while editing param type + 2. Attribute and operations added through quick edit now appear at their proper places in main tree view + 3. Fixed operation propagation that got broken during previous releases +v1.0b7.1 + 1. Fixed the issue that stopped app from closing rpoperly + v1.0b7 1. Previously, after "close window" button was clicked and user selected "Cancel" the app closed nevertheless. No longer the case. 2. Fixed crash when reopening operation window that had different amount of KV-pairs diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 4650f62a0..9f7432a39 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -393,6 +393,8 @@ void QuickEdit::AddOperation() if(!classNode) return; BrowserOperation* newOperation = static_cast(classNode->addOperation()); + classNode->move(newOperation, currentNode); + classNode->select_in_browser(); QModelIndex parentIndex; TreeItemInterface* parent; if(treeModel->parent(current).isValid()) @@ -457,6 +459,8 @@ void QuickEdit::AddAttribute() newAttribute = static_cast(classNode->addEnumItem()); else newAttribute = static_cast(classNode->addAttribute()); + classNode->move(newAttribute, currentNode); + classNode->select_in_browser(); QModelIndex parentIndex; TreeItemInterface* parent; if(treeModel->parent(current).isValid()) @@ -670,7 +674,6 @@ void QuickEdit::closeEvent(QCloseEvent *) else settings.setValue("window/size",QSize()); ui->leSearch->setText(""); - localNodeHolder.clear(); } QSharedPointer QuickEdit::CreateInterfaceNode(QSharedPointer root, diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 524aef9c7..0672b7832 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1365,7 +1365,7 @@ void BrowserNode::children(BrowserNodeList & nodes, } -QList BrowserNode::children(QList searchTypes) const +QList BrowserNode::children(QList searchTypes, bool includeDeleted) const { QList items; Q3ListViewItem * child; @@ -1376,7 +1376,7 @@ QList BrowserNode::children(QList searchTypes) const UmlCode type = ((BrowserNode *) child)->get_type(); //QLOG_INFO() << stringify(type); bool validType = searchTypes.contains(type); - if ( isAlive && validType) + if ( (isAlive || includeDeleted) && validType) items.append((BrowserNode *) child); } return items; diff --git a/src/browser/BrowserNode.h b/src/browser/BrowserNode.h index a83052346..b2c63552e 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -203,7 +203,7 @@ class BrowserNode : public Q3ListViewItem, void edit(const char *, const QStringList & default_stereotypes); void children(BrowserNodeList & nodes, UmlCode kind1, UmlCode kind2 = UmlRelations) const; - QList children(QList) const; + QList children(QList, bool includeDeleted = true) const; virtual QString full_name(bool rev = FALSE, bool itself = TRUE) const; QString fullname(bool rev) const; diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index fed2fb0e4..6491c7f38 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -3564,10 +3564,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 @@ -4030,11 +4030,27 @@ bool operator==(const OperationData & origin, const OperationData & another) } - +#include bool PropagationEquality(const OperationData & origin, const OperationData & another) { - bool paramsResult = false; - paramsResult = origin.params != another.params; + bool paramsResult = true; + + if(origin.params.size() != another.params.size()) + paramsResult = false; + else + { + int i = 0; + 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; @@ -4067,7 +4083,7 @@ bool PropagationEquality(const OperationData & origin, const OperationData & ano 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_def!= another.cpp_def || origin.cpp_name_spec!= another.cpp_name_spec|| From d1e888a1d98941bb6a20c85846e594223c10f0ed Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 19 May 2013 14:14:31 +0400 Subject: [PATCH 090/297] fix for incorrect propagation question --- src/data/OperationData.cpp | 32 +++++++++++++++++++------------- src/dialog/OperationDialog.cpp | 3 +++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 6491c7f38..688211921 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -3945,18 +3945,24 @@ void OperationData::read(char *& st, char *& k) } bool operator==(const OperationData & origin, const OperationData & another) { - bool paramsResult = false; -// if(origin.params.isEmpty() && another.params.isEmpty()) -// paramsResult = true; -// else if(origin.params != another.params) -// { -// if(origin.params.isEmpty()) -// return false; -// else if(another.params.isEmpty() == nullptr) -// return false; -// paramsResult = *origin.params == *another.params; -// } - paramsResult = origin.params == another.params; + 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; + } + } + if(!paramsResult) return false; if(origin.uml_visibility != another.uml_visibility || @@ -4039,7 +4045,7 @@ bool PropagationEquality(const OperationData & origin, const OperationData & ano paramsResult = false; else { - int i = 0; + int i = -1; auto it = origin.params.begin(); while(it != origin.params.end()) { diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 3bb438efe..3c79c6033 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -3237,6 +3237,7 @@ void OperationDialog::post_php_edit_body(OperationDialog * d, QString s) bool OperationDialog::SaveData() { + BrowserClass* containingClass = static_cast(oper->browser_node->get_container(UmlClass)); QList passedNodes; bool goBack = true; @@ -3249,6 +3250,8 @@ bool OperationDialog::SaveData() bool equals = *oper == *operCopy; bool newst = operCopy->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace())); delete operCopy; + if(equals) + return true; if(!inheritanceSiblings.isEmpty() && !equals) { From e6a49950d9a26c05f8a1ef8f91a81467fcaa5aac Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 20 May 2013 23:57:17 +0400 Subject: [PATCH 091/297] fix for unidirectional association dialog crash --- src/dialog/KeyValueTable.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/dialog/KeyValueTable.cpp b/src/dialog/KeyValueTable.cpp index 6d72ac85b..3a2c4b643 100644 --- a/src/dialog/KeyValueTable.cpp +++ b/src/dialog/KeyValueTable.cpp @@ -148,6 +148,11 @@ void KeyValuesTable::remove(const char * key) void KeyValuesTable::Init(HaveKeyValueData *kvData, bool isReadOnly) { + if(!kvData) + { + this->setEnabled(false); + return; + } AdjustColumnCount(isReadOnly); AdjustRowCount(kvData, isReadOnly); SetupTableText(kvData, isReadOnly); From 04a5431d7b82429d4e54c5e32161b6190d859344 Mon Sep 17 00:00:00 2001 From: zeks Date: Tue, 21 May 2013 18:05:26 +0400 Subject: [PATCH 092/297] 1. Fixed copying of attribute (crashed on copying getters) 2. Duplicate into now duplicates INTO 3. Copying class/artifact will also copy KV table Conflicts: Makefile --- Makefile | 310 +- src/CppGenerator/CppRefType.cpp | 644 +-- src/CppGenerator/UmlArtifact.cpp | 1038 +++-- src/CppGenerator/UmlPackage.cpp | 6 +- src/CppGenerator/main.cpp | 2 + src/CppGenerator/util.cpp | 366 +- src/browser/BrowserClass.cpp | 11 +- src/browser/BrowserNode.cpp | 47 +- src/browser/BrowserPackage.cpp | 6455 +++++++++++++++--------------- 9 files changed, 4454 insertions(+), 4425 deletions(-) diff --git a/Makefile b/Makefile index e3fece6a2..759f247d4 100644 --- a/Makefile +++ b/Makefile @@ -1,155 +1,155 @@ -# 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 -# /x/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 - -# for packaging purpose, useless by default -ifndef DESTDIR - DESTDIR = ${PWD}/install -endif - -ifndef DEB_DESTDIR - DEB_DESTDIR = ${DESTDIR} -endif - -QMAKE=qmake - -MAKE=make - -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/PythonGenerator \ - src/RoundtripBody - -PLUGOUT_DIRS=genplugouts/BrowserSort \ - genplugouts/CppUtilities \ - genplugouts/FileControl \ - genplugouts/GlobalChange \ - genplugouts/HtmlDoc \ - genplugouts/Xmi2Generator \ - genplugouts/xmi2import - -PROGS=douml \ - browsersort \ - cpp_generator \ - cpp_reverse \ - cpp_roundtrip \ - cpp_util \ - file_control \ - ghtml \ - global_change \ - idl_generator \ - java_catalog \ - java_generator \ - java_reverse \ - java_roundtrip \ - php_generator \ - php_reverse \ - python_generator \ - roundtrip_body \ - gxmi2 \ - ixmi2 - -compile: src/settings_ini.h - ( 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 - -src/settings_ini.h: bin/settings.ini - ( cd bin && xxd -i settings.ini ../src/settings_ini.h; ) || exit 1 - -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)" - for i in $(PROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)" ; done - echo "#!/bin/sh" >$(DESTDIR)$(DOUML_DIR)/douml - echo "PATH=$(DEB_DESTDIR)$(DOUML_LIB):$$"PATH >>$(DESTDIR)$(DOUML_DIR)/douml - echo "DOUML_LIB_DIR=$(DEB_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 $(DEB_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 "Comment=Free UML 2 modeler" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \ - echo "Exec=$(DEB_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;" >> "$(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 - for i in $(PROGS); do rm -f bin/$$i; done - rm -rf bin/moc_release bin/moc_debug - rm -rf bin/obj_release bin/obj_debug - -.PHONY: compile clean install uninstall +# 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 +# /x/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 + +# for packaging purpose, useless by default +ifndef DESTDIR + DESTDIR = ${PWD}/install +endif + +ifndef DEB_DESTDIR + DEB_DESTDIR = ${DESTDIR} +endif + +QMAKE=qmake + +MAKE=make + +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/PythonGenerator \ + src/RoundtripBody + +PLUGOUT_DIRS=genplugouts/BrowserSort \ + genplugouts/CppUtilities \ + genplugouts/FileControl \ + genplugouts/GlobalChange \ + genplugouts/HtmlDoc \ + genplugouts/Xmi2Generator \ + genplugouts/xmi2import + +PROGS=douml \ + browsersort \ + cpp_generator \ + cpp_reverse \ + cpp_roundtrip \ + cpp_util \ + file_control \ + ghtml \ + global_change \ + idl_generator \ + java_catalog \ + java_generator \ + java_reverse \ + java_roundtrip \ + php_generator \ + php_reverse \ + python_generator \ + roundtrip_body \ + gxmi2 \ + ixmi2 + +compile: src/settings_ini.h + ( 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 + +src/settings_ini.h: bin/settings.ini + ( cd bin && xxd -i settings.ini ../src/settings_ini.h; ) || exit 1 + +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)" + for i in $(PROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)" ; done + echo "#!/bin/sh" >$(DESTDIR)$(DOUML_DIR)/douml + echo "PATH=$(DEB_DESTDIR)$(DOUML_LIB):$$"PATH >>$(DESTDIR)$(DOUML_DIR)/douml + echo "DOUML_LIB_DIR=$(DEB_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 $(DEB_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 "Comment=Free UML 2 modeler" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \ + echo "Exec=$(DEB_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;" >> "$(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 + for i in $(PROGS); do rm -f bin/$$i; done + rm -rf bin/moc_release bin/moc_debug + rm -rf bin/obj_release bin/obj_debug + +.PHONY: compile clean install uninstall diff --git a/src/CppGenerator/CppRefType.cpp b/src/CppGenerator/CppRefType.cpp index ff2496daa..d3464affc 100644 --- a/src/CppGenerator/CppRefType.cpp +++ b/src/CppGenerator/CppRefType.cpp @@ -1,322 +1,322 @@ -// ************************************************************************* -// -// 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 "CppRefType.h" -#include "UmlClass.h" -#include "UmlSettings.h" -#include "CppSettings.h" -#include "UmlPackage.h" -#include "UmlArtifact.h" -#include "UmlCom.h" -#include "util.h" -//Added by qt3to4: -#include "misc/mystr.h" -//Added by qt3to4: -#include - -// not in case of a dependency => external class in h -bool CppRefType::add(const UmlTypeSpec & t, Q3PtrList & l, - bool incl) -{ - return (t.type) - ? add(t.type, l, incl || t.type->isCppExternal()) - : add(t.explicit_type, l, incl); -} - -bool CppRefType::add(UmlClass * cl, Q3PtrList & l, - bool incl, bool hight) -{ - CppRefType * ref; - WrapperStr t = cl->name(); - Weight w; - - if (cl->parent()->kind() == aClass) { - // nested => need include parent - do - cl = (UmlClass *) cl->parent(); - - while (cl->parent()->kind() == aClass); - - incl = TRUE; - w = Strong; - } - else if (incl) - w = (hight) ? Strong : Medium; - else - w = (hight) ? High : Low; - - for (ref = l.first(); ref; ref = l.next()) { - // 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 (w > ref->weight) - ref->included = incl; - - return TRUE; - } - } - - l.append(new CppRefType(cl, incl, w)); - return TRUE; -} - -bool CppRefType::add(const WrapperStr & t, Q3PtrList & l, bool incl) -{ - if (t.isEmpty()) - return FALSE; - - static Q3Dict cpp_builtin_types; - - if (cpp_builtin_types.count() == 0) { - cpp_builtin_types.insert("unsigned", " "); - cpp_builtin_types.insert("signed", " "); - cpp_builtin_types.insert("char", " "); - cpp_builtin_types.insert("short", " "); - cpp_builtin_types.insert("int", " "); - cpp_builtin_types.insert("long", " "); - cpp_builtin_types.insert("float", " "); - cpp_builtin_types.insert("double", " "); - cpp_builtin_types.insert("bool", " "); - cpp_builtin_types.insert("void", " "); - } - - if (cpp_builtin_types[t] != 0) - return TRUE; - - CppRefType * ref; - Weight w = (incl) ? Medium : Low; - - for (ref = l.first(); ref; ref = l.next()) { - if (ref->type.toString() == t) { - if (w > ref->weight) - ref->included = incl; - - return TRUE; - } - } - - l.append(new CppRefType(t, incl, w)); - return TRUE; -} - -void CppRefType::remove(const WrapperStr & t, Q3PtrList & l) -{ - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { - if ((*it)->type.explicit_type == t) { - delete *it; - l.remove(it); - return; - } - } -} - -void CppRefType::remove(UmlClass * cl, Q3PtrList & l) -{ - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { - if ((*it)->type.type == cl) { - l.remove(it); - return; - } - } -} - -void CppRefType::force_ref(UmlClass * cl, Q3PtrList & l) -{ - CppRefType * ref; - WrapperStr t = cl->name(); - - for (ref = l.first(); ref; ref = l.next()) { - // 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)) { - ref->included = FALSE; - return; - } - } -} - -void CppRefType::compute(Q3PtrList & dependencies, - const WrapperStr & hdef, const WrapperStr & srcdef, - WrapperStr & h_incl, WrapperStr & decl, WrapperStr & src_incl, - UmlArtifact * who) -{ - UmlPackage * pack = who->package(); - WrapperStr hdir; - WrapperStr srcdir; - - if (CppSettings::isRelativePath()) { - WrapperStr empty; - - hdir = pack->header_path(empty); - srcdir = pack->source_path(empty); - } - else if (CppSettings::isRootRelativePath()) - hdir = srcdir = UmlPackage::rootDir(); - - // aze.cpp includes aze.h - src_incl += "#include \""; - - if (CppSettings::includeWithPath()) - src_incl += pack->header_path(who->name(), srcdir); - else { - src_incl += who->name(); - src_incl += '.'; - src_incl += CppSettings::headerExtension(); - } - - src_incl += "\"\n"; - h_incl = ""; // to not be WrapperStr::null - decl = ""; // to not be WrapperStr::null - - CppRefType * ref; - - for (ref = dependencies.first(); ref != 0; ref = dependencies.next()) - { - 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 - - if (cl == 0) { - WrapperStr in = CppSettings::include(ref->type.explicit_type); - - if (!in.isEmpty()) - hform = srcform = in + '\n'; - else - // doesn't know what it is - continue; - } - else if (cl->isCppExternal()) - { - QString className = cl->name(); - hform = cl->cppDecl(); - - int index; - - if ((index = hform.find('\n')) == -1) - // wrong form - continue; - - hform = hform.mid(index + 1) + '\n'; - - for (;;) { - if ((index = hform.find("${name}")) != -1) - hform.replace(index, 7, cl->name()); - 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()); - else if ((index = hform.find("${nAME}")) != -1) - hform.replace(index, 7, cl->name().lower()); - else - break; - } - - srcform = hform; - } - else { - QString className = cl->name(); - WrapperStr st = cl->cpp_stereotype(); - - if ((st == "enum") || (st == "typedef")) - included = TRUE; - - UmlArtifact * art = cl->associatedArtifact(); - - if (art != 0) { - if (art == who) - // don't include itself - continue; - - if (CppSettings::includeWithPath()) { - UmlPackage * p = art->package(); - - hform = "#include \"" + p->header_path(art->name(), hdir) + "\"\n"; - srcform = "#include \"" + p->header_path(art->name(), srcdir) + "\"\n"; - } - else - srcform = hform = "#include \"" + art->name() + '.' + - CppSettings::headerExtension() + "\"\n"; - } - else if (cl->parent()->kind() != aClass) { - write_trace_header(); - UmlCom::trace(WrapperStr("     class ") + cl->name() + - " referenced but does not have associated artifact
"); - incr_warning(); - continue; - } - } - - if (included) { - // #include must be placed in the header file - if ((h_incl.find(hform) == -1) && (hdef.find(hform) == -1)) - h_incl += hform; - } - else if ((cl != 0) && - (cl->parent()->kind() != aClass)) { // else too complicated - // #include useless in header file, place it in the source file - if ((src_incl.find(srcform) == -1) && (h_incl.find(hform) == -1) && - (hdef.find(hform) == -1) && (srcdef.find(srcform) == -1)) - src_incl += srcform; - - if (!cl->isCppExternal()) { - // header file must contains the declaration - hform = cl->decl(); - - if (decl.find(hform) == -1) - decl += hform; - - if ((cl->associatedArtifact() == 0) && - (cl->parent()->kind() != aClass)) { - write_trace_header(); - UmlCom::trace(WrapperStr("     class ") + cl->name() + - " referenced but does not have associated artifact
"); - incr_warning(); - } - } - } - else if (!hform.isEmpty()) { - // have the #include form but does not know if it is a class or other, - // generate the #include in the header file EXCEPT if the #include is - // already in the header/source file to allow to optimize the generated - // code - if ((src_incl.find(srcform) == -1) && (h_incl.find(hform) == -1) && - (hdef.find(hform) == -1) && (srcdef.find(srcform) == -1)) - h_incl += hform; - } - } -} +// ************************************************************************* +// +// 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 "CppRefType.h" +#include "UmlClass.h" +#include "UmlSettings.h" +#include "CppSettings.h" +#include "UmlPackage.h" +#include "UmlArtifact.h" +#include "UmlCom.h" +#include "util.h" +//Added by qt3to4: +#include "misc/mystr.h" +//Added by qt3to4: +#include + +// not in case of a dependency => external class in h +bool CppRefType::add(const UmlTypeSpec & t, Q3PtrList & l, + bool incl) +{ + return (t.type) + ? add(t.type, l, incl || t.type->isCppExternal()) + : add(t.explicit_type, l, incl); +} + +bool CppRefType::add(UmlClass * cl, Q3PtrList & l, + bool incl, bool hight) +{ + CppRefType * ref; + WrapperStr t = cl->name(); + Weight w; + + if (cl->parent()->kind() == aClass) { + // nested => need include parent + do + cl = (UmlClass *) cl->parent(); + + while (cl->parent()->kind() == aClass); + + incl = TRUE; + w = Strong; + } + else if (incl) + w = (hight) ? Strong : Medium; + else + w = (hight) ? High : Low; + + for (ref = l.first(); ref; ref = l.next()) { + // 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 (w > ref->weight) + ref->included = incl; + + return TRUE; + } + } + + l.append(new CppRefType(cl, incl, w)); + return TRUE; +} + +bool CppRefType::add(const WrapperStr & t, Q3PtrList & l, bool incl) +{ + if (t.isEmpty()) + return FALSE; + + static Q3Dict cpp_builtin_types; + + if (cpp_builtin_types.count() == 0) { + cpp_builtin_types.insert("unsigned", " "); + cpp_builtin_types.insert("signed", " "); + cpp_builtin_types.insert("char", " "); + cpp_builtin_types.insert("short", " "); + cpp_builtin_types.insert("int", " "); + cpp_builtin_types.insert("long", " "); + cpp_builtin_types.insert("float", " "); + cpp_builtin_types.insert("double", " "); + cpp_builtin_types.insert("bool", " "); + cpp_builtin_types.insert("void", " "); + } + + if (cpp_builtin_types[t] != 0) + return TRUE; + + CppRefType * ref; + Weight w = (incl) ? Medium : Low; + + for (ref = l.first(); ref; ref = l.next()) { + if (ref->type.toString() == t) { + if (w > ref->weight) + ref->included = incl; + + return TRUE; + } + } + + l.append(new CppRefType(t, incl, w)); + return TRUE; +} + +void CppRefType::remove(const WrapperStr & t, Q3PtrList & l) +{ + Q3PtrListIterator it(l); + + for (; it.current(); ++it) { + if ((*it)->type.explicit_type == t) { + delete *it; + l.remove(it); + return; + } + } +} + +void CppRefType::remove(UmlClass * cl, Q3PtrList & l) +{ + Q3PtrListIterator it(l); + + for (; it.current(); ++it) { + if ((*it)->type.type == cl) { + l.remove(it); + return; + } + } +} + +void CppRefType::force_ref(UmlClass * cl, Q3PtrList & l) +{ + CppRefType * ref; + WrapperStr t = cl->name(); + + for (ref = l.first(); ref; ref = l.next()) { + // 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)) { + ref->included = FALSE; + return; + } + } +} + +void CppRefType::compute(Q3PtrList & dependencies, + const WrapperStr & hdef, const WrapperStr & srcdef, + WrapperStr & h_incl, WrapperStr & decl, WrapperStr & src_incl, + UmlArtifact * who) +{ + UmlPackage * pack = who->package(); + WrapperStr hdir; + WrapperStr srcdir; + + if (CppSettings::isRelativePath()) { + WrapperStr empty; + + hdir = pack->header_path(empty); + srcdir = pack->source_path(empty); + } + else if (CppSettings::isRootRelativePath()) + hdir = srcdir = UmlPackage::rootDir(); + + // aze.cpp includes aze.h + src_incl += "#include \""; + + if (CppSettings::includeWithPath()) + src_incl += pack->header_path(who->name(), srcdir); + else { + src_incl += who->name(); + src_incl += '.'; + src_incl += CppSettings::headerExtension(); + } + + src_incl += "\"\n"; + h_incl = ""; // to not be WrapperStr::null + decl = ""; // to not be WrapperStr::null + + CppRefType * ref; + + for (ref = dependencies.first(); ref != 0; ref = dependencies.next()) + { + 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 + + if (cl == 0) { + WrapperStr in = CppSettings::include(ref->type.explicit_type); + + if (!in.isEmpty()) + hform = srcform = in + '\n'; + else + // doesn't know what it is + continue; + } + else if (cl->isCppExternal()) + { + QString className = cl->name(); + hform = cl->cppDecl(); + + int index; + + if ((index = hform.find('\n')) == -1) + // wrong form + continue; + + hform = hform.mid(index + 1) + '\n'; + + for (;;) { + if ((index = hform.find("${name}")) != -1) + hform.replace(index, 7, cl->name()); + 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()); + else if ((index = hform.find("${nAME}")) != -1) + hform.replace(index, 7, cl->name().lower()); + else + break; + } + + srcform = hform; + } + else { + QString className = cl->name(); + WrapperStr st = cl->cpp_stereotype(); + + if ((st == "enum") || (st == "typedef")) + included = TRUE; + + UmlArtifact * art = cl->associatedArtifact(); + + if (art != 0) { + if (art == who) + // don't include itself + continue; + + if (CppSettings::includeWithPath()) { + UmlPackage * p = art->package(); + + hform = "#include \"" + p->header_path(art->name(), hdir) + "\"\n"; + srcform = "#include \"" + p->header_path(art->name(), srcdir) + "\"\n"; + } + else + srcform = hform = "#include \"" + art->name() + '.' + + CppSettings::headerExtension() + "\"\n"; + } + else if (cl->parent()->kind() != aClass) { + write_trace_header(); + UmlCom::trace(WrapperStr("     class ") + cl->name() + + " referenced but does not have associated artifact
"); + incr_warning(); + continue; + } + } + + if (included) { + // #include must be placed in the header file + if ((h_incl.find(hform) == -1) && (hdef.find(hform) == -1)) + h_incl += hform; + } + else if ((cl != 0) && + (cl->parent()->kind() != aClass)) { // else too complicated + // #include useless in header file, place it in the source file + if ((src_incl.find(srcform) == -1) && (h_incl.find(hform) == -1) && + (hdef.find(hform) == -1) && (srcdef.find(srcform) == -1)) + src_incl += srcform; + + if (!cl->isCppExternal()) { + // header file must contains the declaration + hform = cl->decl(); + + if (decl.find(hform) == -1) + decl += hform; + + if ((cl->associatedArtifact() == 0) && + (cl->parent()->kind() != aClass)) { + write_trace_header(); + UmlCom::trace(WrapperStr("     class ") + cl->name() + + " referenced but does not have associated artifact
"); + incr_warning(); + } + } + } + else if (!hform.isEmpty()) { + // have the #include form but does not know if it is a class or other, + // generate the #include in the header file EXCEPT if the #include is + // already in the header/source file to allow to optimize the generated + // code + if ((src_incl.find(srcform) == -1) && (h_incl.find(hform) == -1) && + (hdef.find(hform) == -1) && (srcdef.find(srcform) == -1)) + h_incl += hform; + } + } +} diff --git a/src/CppGenerator/UmlArtifact.cpp b/src/CppGenerator/UmlArtifact.cpp index c0fcf704e..94927dbbc 100644 --- a/src/CppGenerator/UmlArtifact.cpp +++ b/src/CppGenerator/UmlArtifact.cpp @@ -1,522 +1,516 @@ -// ************************************************************************* -// -// 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 -#include -#include -//Added by qt3to4: -#include "misc/mystr.h" -#include -//Added by qt3to4: -#include - -#include "UmlArtifact.h" -#include "UmlPackage.h" -#include "UmlClass.h" -#include "UmlOperation.h" -#include "CppRefType.h" -#include "CppSettings.h" -#include "UmlCom.h" -#include "util.h" -#include "misc/codec.h" -#include -#include - -UmlPackage * UmlArtifact::package_of_generated_artifact; - -void UmlArtifact::generate() -{ - if (! managed) { - managed = TRUE; - - if (stereotype() == "text") { - generate_text(); - return; - } - else if (stereotype() != "source") - return; - - package_of_generated_artifact = package(); - - const WrapperStr hdef = cppHeader(); - QLOG_INFO() << "Read header as: " + hdef.operator QString(); - const WrapperStr srcdef = cppSource(); - - if (hdef.isEmpty() && srcdef.isEmpty()) { - if (verbose()) - UmlCom::trace(WrapperStr("
artifact ") - + name() + " has an empty C++ definition
"); - - return; - } - - const WrapperStr & name = UmlArtifact::name(); - UmlPackage * pack = package(); - WrapperStr h_path = pack->header_path(name); - WrapperStr src_path = pack->source_path(name); - WrapperStr nasp_start; - WrapperStr nasp_end; - const char * cnasp = pack->cppNamespace(); - WrapperStr nasp = ((cnasp[0] == ':') && (cnasp[1] == ':')) - ? cnasp + 2 : cnasp; - - if (!nasp.isEmpty()) { - int index = 0; - int index2; - WrapperStr closed = "\n} // namespace "; - - while ((index2 = nasp.find(':', index)) != -1) { - WrapperStr na = nasp.mid(index, index2 - index); - - nasp_start += WrapperStr("namespace ") + na + " {\n\n"; - closed += na; - nasp_end = closed + "\n" + nasp_end; - closed += "::"; - nasp.replace(index2, 2, "_"); - index = index2 + 1; - } - - nasp_start += WrapperStr("namespace ") + nasp.mid(index) + " {\n\n"; - closed += nasp.mid(index); - nasp_end = closed + "\n" + nasp_end; - } - else { - WrapperStr s; - - if (!hdef.isEmpty()) - s = " in " + h_path + ""; - - if (!srcdef.isEmpty()) { - if (!hdef.isEmpty()) - s += " and " + src_path + ""; - else - s = " in " + src_path + ""; - } - - UmlCom::message(name); - - if (verbose()) - UmlCom::trace(WrapperStr("
Generate code for ") - + name + "" + s + "
"); - else - set_trace_header(WrapperStr("Generate code for ") - + name + "" + s + "
"); - } - - // get bodies if preserve - const Q3PtrVector & cls = associatedClasses(); - - if (preserve()) - UmlOperation::read_bodies(h_path, src_path); - - // compute dependencies - - bool all_in_h = (hdef.find("${all_includes}") != -1); - Q3PtrList dependencies; - unsigned n = cls.count(); - unsigned index; - - for (index = 0; index != n; index += 1) - cls[index]->compute_dependencies(dependencies, all_in_h); - - // generate header file - - WrapperStr h_incl; - WrapperStr src_incl; - WrapperStr decl; - bool incl_computed = FALSE; - - if (!hdef.isEmpty()) { - - - //headerFile->append("Test DAta"); - - QLOG_INFO() << "openign file for writing: "; - //QTextStream f_h(file.data()); //[lgfreitas] Now QTextStream receives a pointer to a byte array... - QSharedPointer headerFile(new QByteArray()); - QTextStream f_h(headerFile.data(), QFile::WriteOnly); - f_h.setCodec(QTextCodec::codecForLocale()); - //QTextStream f_h(headerFile.data(), QIODevice::WriteOnly); - //QString h_copy = QString(hdef.operator QString()); - const char * p = hdef; - const char * pp = 0; - - for (;;) - { - QLOG_INFO() << "At this point P is: " << QString(p); - if (*p == 0) { - if (pp == 0) - break; - - // comment management done - p = pp; - pp = 0; - - if (*p == 0) - break; - } - - - if (*p == '@') - manage_alias(p, f_h); - else if (*p != '$') - { - f_h << toLocale(p); - } - else if (!strncmp(p, "${comment}", 10)) - manage_comment(p, pp, CppSettings::isGenerateJavadocStyleComment()); - else if (!strncmp(p, "${description}", 14)) - manage_description(p, pp); - else if (!strncmp(p, "${name}", 7)) { - p += 7; - f_h << name; - } - else if (!strncmp(p, "${Name}", 7)) { - p += 7; - //QLOG_INFO() << "Outputting name: " << name; - f_h << capitalize(name); - } - else if (!strncmp(p, "${NAME}", 7)) { - p += 7; - f_h << name.upper(); - } - else if (!strncmp(p, "${nAME}", 7)) { - p += 7; - f_h << name.lower(); - } - else if (!strncmp(p, "${namespace}", 12)) { - p += 12; - f_h << nasp; - } - else if (!strncmp(p, "${NAMESPACE}", 12)) { - p += 12; - f_h << nasp.upper(); - } - else if (!strncmp(p, "${includes}", 11) - || !strncmp(p, "${all_includes}", 15)) - { - QLOG_INFO() << "REaDING INCLUDES"; - p += (p[2] == 'a') ? 15 : 11; - QLOG_INFO() << "Modified p 1 to be" << QString(p); - if (!incl_computed) - { - incl_computed = TRUE; - CppRefType::compute(dependencies, hdef.operator QString(), srcdef, h_incl, decl, src_incl, this); - QLOG_INFO() << "Modified hdef to be: " << hdef.operator QString(); - - } - QLOG_INFO() << "Modified p 2 to be" << QString(p); - if (!h_incl.isEmpty()) - { - f_h << h_incl; - - if (*p != '\n') - f_h << '\n'; - } - else if (*p == '\n') - p += 1; - QLOG_INFO() << "FINISHED INCLUDES"; - } - else if (!strncmp(p, "${declarations}", 15)) - { - p += 15; - - if (!incl_computed) - { - incl_computed = TRUE; - CppRefType::compute(dependencies, hdef.operator QString(), srcdef, h_incl, decl, src_incl, this); - } - QLOG_INFO() << "DECLS IS: " << decl.operator QString(); - if (!decl.isEmpty()) - { - f_h << decl; - - if (*p != '\n') - f_h << '\n'; - } - else if (*p == '\n') - p += 1; - } - else if (!strncmp(p, "${namespace_start}", 18)) { - p += 18; - - if (!nasp_start.isEmpty()) - f_h << nasp_start; - - if (*p == '\n') - p += 1; - } - else if (!strncmp(p, "${namespace_end}", 16)) { - p += 16; - - if (!nasp_end.isEmpty()) - f_h << nasp_end; - - if (*p == '\n') - p += 1; - } - else if (!strncmp(p, "${definition}", 13)) { - p += 13; - - for (index = 0; index != n; index += 1) - cls[index]->generate_decl(f_h, current_indent(p, hdef.operator QString())); - - if (*p == '\n') - p += 1; - } - else - // strange - f_h << toLocale(p); - } - - f_h << '\000'; - f_h.flush(); - - if (must_be_saved(h_path, headerFile->data())) { - QLOG_INFO() << "this is essentially what goes to the header file: " << headerFile->size(); - write_trace_header(); - - //FILE * fp_h; - QFile file(h_path); - if (!file.open(QFile::WriteOnly)) - { - UmlCom::trace(WrapperStr(" ") - + name + " : cannot open " - + h_path + ", edit the generation settings (tab directory) or the " - + pack->name() + " C++ directory specification
"); - incr_error(); - } - else { - QLOG_INFO() << "this is essentially what goes to the file: " << headerFile->constData(); - - QTextCodec* codec = QTextCodec::codecForLocale(); - QTextStream out(&file); - out.setCodec(QTextCodec::codecForLocale()); - QString temp(*headerFile.data()); - out << codec->toUnicode(temp); - //out << *headerFile.data(); - out.flush(); - } - } - else { - WrapperStr th = get_trace_header(); - - if (th.isEmpty()) - UmlCom::trace(WrapperStr("
") - + h_path + " not modified
"); - else - set_trace_header(th + " " - + h_path + " not modified
"); - } - } - - // generate source file - - if (!srcdef.isEmpty()) { - QSharedPointer file(new QByteArray()); - QTextStream f_src(file.data(), QIODevice::WriteOnly); - const char * p = srcdef; - const char * pp = 0; - - for (;;) { - if (*p == 0) { - if (pp == 0) - break; - - // comment management done - p = pp; - pp = 0; - - if (*p == 0) - break; - } - - if (*p == '@') - manage_alias(p, f_src); - else if (*p != '$') - f_src << toLocale(p); - else if (!strncmp(p, "${comment}", 10)) - manage_comment(p, pp, CppSettings::isGenerateJavadocStyleComment()); - else if (!strncmp(p, "${description}", 14)) - manage_description(p, pp); - else if (!strncmp(p, "${name}", 7)) { - // for file header - p += 7; - f_src << name; - } - else if (!strncmp(p, "${includes}", 11)) { - p += 11; - - if (!incl_computed) { - incl_computed = TRUE; - CppRefType::compute(dependencies, hdef.operator QString(), srcdef, h_incl, decl, src_incl, this); - } - - if (!src_incl.isEmpty()) { - f_src << src_incl; - - if (*p != '\n') - f_src << '\n'; - } - else if (*p == '\n') - p += 1; - } - else if (!strncmp(p, "${members}", 10)) { - p += 10; - - for (index = 0; index != n; index += 1) - cls[index]->generate_def(f_src, current_indent(p, srcdef), FALSE); - - if (*p == '\n') - p += 1; - } - else if (!strncmp(p, "${namespace_start}", 18)) { - p += 18; - - if (!nasp_start.isEmpty()) - f_src << nasp_start; - - if (*p == '\n') - p += 1; - } - else if (!strncmp(p, "${namespace_end}", 16)) { - p += 16; - - if (!nasp_end.isEmpty()) - f_src << nasp_end; - - if (*p == '\n') - p += 1; - } - else - // strange - f_src << toLocale(p); - } - - f_src << '\000'; - f_src.flush(); - - if (must_be_saved(src_path, file->data())) { - write_trace_header(); - - FILE * fp_src; - - if ((fp_src = fopen((const char *) src_path, "wb")) == 0) { - write_trace_header(); - UmlCom::trace(WrapperStr(" ") - + name + " : cannot open " - + src_path + ", edit the generation settings (tab directory) or the " - + pack->name() + " C++ directory specification
"); - incr_error(); - } - else { - fputs((const char *) file->data(), fp_src); - fclose(fp_src); - } - } - else if (get_trace_header().isEmpty()) - UmlCom::trace(WrapperStr(" ") - + src_path + " not modified
"); - } - } -} - -void UmlArtifact::generate_text() -{ - const WrapperStr srcdef = cppSource(); - - if (srcdef.isEmpty()) { - if (verbose()) - UmlCom::trace(WrapperStr("
artifact ") - + name() + " has an empty C++ definition
"); - - return; - } - - UmlPackage * pack = package(); - const WrapperStr & name = UmlArtifact::name(); - WrapperStr src_path = pack->text_path(name); - - WrapperStr s = " in " + src_path + ""; - - UmlCom::message(name); - - if (verbose()) - UmlCom::trace(WrapperStr("
Generate code for ") - + name + "" + s + "
"); - else - set_trace_header(WrapperStr("Generate code for ") - + name + "" + s + "
"); - - if (must_be_saved(src_path, (const char *) srcdef)) { - write_trace_header(); - - FILE * fp_src; - - if ((fp_src = fopen((const char *) src_path, "wb")) == 0) { - write_trace_header(); - UmlCom::trace(WrapperStr(" ") - + name + " : cannot open " - + src_path + ", edit the generation settings (tab directory) or the " - + pack->name() + " C++ directory specification
"); - incr_error(); - } - else { - fputs((const char *) srcdef, fp_src); - fclose(fp_src); - } - } - else if (get_trace_header().isEmpty()) - UmlCom::trace(WrapperStr(" ") - + src_path + " not modified
"); -} - -UmlPackage * UmlArtifact::generation_package() -{ - return package_of_generated_artifact; -} - -bool UmlArtifact::must_be_saved(const char * path, const char * new_contains) -{ - FILE * fp = fopen(path, "rb"); - - if (fp == 0) - return TRUE; - - int c; - - while ((c = fgetc(fp)) != EOF) { - if (((char) c) != *new_contains++) { - fclose(fp); - return TRUE; - } - } - - fclose(fp); - - return *new_contains != 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 +#include +#include +//Added by qt3to4: +#include "misc/mystr.h" +#include +//Added by qt3to4: +#include + +#include "UmlArtifact.h" +#include "UmlPackage.h" +#include "UmlClass.h" +#include "UmlOperation.h" +#include "CppRefType.h" +#include "CppSettings.h" +#include "UmlCom.h" +#include "util.h" +#include "misc/codec.h" +#include +#include + +UmlPackage * UmlArtifact::package_of_generated_artifact; + +void UmlArtifact::generate() +{ + if (! managed) { + managed = TRUE; + + if (stereotype() == "text") { + generate_text(); + return; + } + else if (stereotype() != "source") + return; + + package_of_generated_artifact = package(); + + const WrapperStr hdef = cppHeader(); + QLOG_INFO() << "Read header as: " + hdef.operator QString(); + const WrapperStr srcdef = cppSource(); + + if (hdef.isEmpty() && srcdef.isEmpty()) { + if (verbose()) + UmlCom::trace(WrapperStr("
artifact ") + + name() + " has an empty C++ definition
"); + + return; + } + + const WrapperStr & name = UmlArtifact::name(); + UmlPackage * pack = package(); + WrapperStr h_path = pack->header_path(name); + WrapperStr src_path = pack->source_path(name); + WrapperStr nasp_start; + WrapperStr nasp_end; + const char * cnasp = pack->cppNamespace(); + WrapperStr nasp = ((cnasp[0] == ':') && (cnasp[1] == ':')) + ? cnasp + 2 : cnasp; + + if (!nasp.isEmpty()) { + int index = 0; + int index2; + WrapperStr closed = "\n} // namespace "; + + while ((index2 = nasp.find(':', index)) != -1) { + WrapperStr na = nasp.mid(index, index2 - index); + + nasp_start += WrapperStr("namespace ") + na + " {\n\n"; + closed += na; + nasp_end = closed + "\n" + nasp_end; + closed += "::"; + nasp.replace(index2, 2, "_"); + index = index2 + 1; + } + + nasp_start += WrapperStr("namespace ") + nasp.mid(index) + " {\n\n"; + closed += nasp.mid(index); + nasp_end = closed + "\n" + nasp_end; + } + else { + WrapperStr s; + + if (!hdef.isEmpty()) + s = " in " + h_path + ""; + + if (!srcdef.isEmpty()) { + if (!hdef.isEmpty()) + s += " and " + src_path + ""; + else + s = " in " + src_path + ""; + } + + UmlCom::message(name); + + if (verbose()) + UmlCom::trace(WrapperStr("
Generate code for ") + + name + "" + s + "
"); + else + set_trace_header(WrapperStr("Generate code for ") + + name + "" + s + "
"); + } + + // get bodies if preserve + const Q3PtrVector & cls = associatedClasses(); + + if (preserve()) + UmlOperation::read_bodies(h_path, src_path); + + // compute dependencies + + bool all_in_h = (hdef.find("${all_includes}") != -1); + Q3PtrList dependencies; + unsigned n = cls.count(); + unsigned index; + + for (index = 0; index != n; index += 1) + cls[index]->compute_dependencies(dependencies, all_in_h); + + // generate header file + + WrapperStr h_incl; + WrapperStr src_incl; + WrapperStr decl; + bool incl_computed = FALSE; + + if (!hdef.isEmpty()) { + + QLOG_INFO() << "openign file for writing: "; + QSharedPointer headerFile(new QByteArray()); + QTextStream f_h(headerFile.data(), QFile::WriteOnly); + f_h.setCodec(QTextCodec::codecForLocale()); + const char * p = hdef; + const char * pp = 0; + + for (;;) + { + QLOG_INFO() << "At this point P is: " << QString(p); + if (*p == 0) { + if (pp == 0) + break; + + // comment management done + p = pp; + pp = 0; + + if (*p == 0) + break; + } + + + if (*p == '@') + manage_alias(p, f_h); + else if (*p != '$') + { + f_h << toLocale(p); + } + else if (!strncmp(p, "${comment}", 10)) + manage_comment(p, pp, CppSettings::isGenerateJavadocStyleComment()); + else if (!strncmp(p, "${description}", 14)) + manage_description(p, pp); + else if (!strncmp(p, "${name}", 7)) { + p += 7; + f_h << name; + } + else if (!strncmp(p, "${Name}", 7)) { + p += 7; + //QLOG_INFO() << "Outputting name: " << name; + f_h << capitalize(name); + } + else if (!strncmp(p, "${NAME}", 7)) { + p += 7; + f_h << name.upper(); + } + else if (!strncmp(p, "${nAME}", 7)) { + p += 7; + f_h << name.lower(); + } + else if (!strncmp(p, "${namespace}", 12)) { + p += 12; + f_h << nasp; + } + else if (!strncmp(p, "${NAMESPACE}", 12)) { + p += 12; + f_h << nasp.upper(); + } + else if (!strncmp(p, "${includes}", 11) + || !strncmp(p, "${all_includes}", 15)) + { + QLOG_INFO() << "REaDING INCLUDES"; + p += (p[2] == 'a') ? 15 : 11; + QLOG_INFO() << "Modified p 1 to be" << QString(p); + if (!incl_computed) + { + incl_computed = TRUE; + CppRefType::compute(dependencies, hdef.operator QString(), srcdef, h_incl, decl, src_incl, this); + QLOG_INFO() << "Modified hdef to be: " << hdef.operator QString(); + + } + QLOG_INFO() << "Modified p 2 to be" << QString(p); + if (!h_incl.isEmpty()) + { + f_h << h_incl; + + if (*p != '\n') + f_h << '\n'; + } + else if (*p == '\n') + p += 1; + QLOG_INFO() << "FINISHED INCLUDES"; + } + else if (!strncmp(p, "${declarations}", 15)) + { + p += 15; + + if (!incl_computed) + { + incl_computed = TRUE; + CppRefType::compute(dependencies, hdef.operator QString(), srcdef, h_incl, decl, src_incl, this); + } + QLOG_INFO() << "DECLS IS: " << decl.operator QString(); + if (!decl.isEmpty()) + { + f_h << decl; + + if (*p != '\n') + f_h << '\n'; + } + else if (*p == '\n') + p += 1; + } + else if (!strncmp(p, "${namespace_start}", 18)) { + p += 18; + + if (!nasp_start.isEmpty()) + f_h << nasp_start; + + if (*p == '\n') + p += 1; + } + else if (!strncmp(p, "${namespace_end}", 16)) { + p += 16; + + if (!nasp_end.isEmpty()) + f_h << nasp_end; + + if (*p == '\n') + p += 1; + } + else if (!strncmp(p, "${definition}", 13)) { + p += 13; + + for (index = 0; index != n; index += 1) + cls[index]->generate_decl(f_h, current_indent(p, hdef.operator QString())); + + if (*p == '\n') + p += 1; + } + else + // strange + f_h << toLocale(p); + } + + f_h << '\000'; + f_h.flush(); + + if (must_be_saved(h_path, headerFile->data())) { + QLOG_INFO() << "this is essentially what goes to the header file: " << headerFile->size(); + write_trace_header(); + + //FILE * fp_h; + QFile file(h_path); + if (!file.open(QFile::WriteOnly)) + { + UmlCom::trace(WrapperStr(" ") + + name + " : cannot open " + + h_path + ", edit the generation settings (tab directory) or the " + + pack->name() + " C++ directory specification
"); + incr_error(); + } + else { + QLOG_INFO() << "this is essentially what goes to the file: " << headerFile->constData(); + + QTextCodec* codec = QTextCodec::codecForLocale(); + QTextStream out(&file); + out.setCodec(QTextCodec::codecForLocale()); + QString temp(*headerFile.data()); + out << codec->toUnicode(temp); + //out << *headerFile.data(); + out.flush(); + } + } + else { + WrapperStr th = get_trace_header(); + + if (th.isEmpty()) + UmlCom::trace(WrapperStr("
") + + h_path + " not modified
"); + else + set_trace_header(th + " " + + h_path + " not modified
"); + } + } + + // generate source file + + if (!srcdef.isEmpty()) { + QSharedPointer file(new QByteArray()); + QTextStream f_src(file.data(), QIODevice::WriteOnly); + const char * p = srcdef; + const char * pp = 0; + + for (;;) { + if (*p == 0) { + if (pp == 0) + break; + + // comment management done + p = pp; + pp = 0; + + if (*p == 0) + break; + } + + if (*p == '@') + manage_alias(p, f_src); + else if (*p != '$') + f_src << toLocale(p); + else if (!strncmp(p, "${comment}", 10)) + manage_comment(p, pp, CppSettings::isGenerateJavadocStyleComment()); + else if (!strncmp(p, "${description}", 14)) + manage_description(p, pp); + else if (!strncmp(p, "${name}", 7)) { + // for file header + p += 7; + f_src << name; + } + else if (!strncmp(p, "${includes}", 11)) { + p += 11; + + if (!incl_computed) { + incl_computed = TRUE; + CppRefType::compute(dependencies, hdef.operator QString(), srcdef, h_incl, decl, src_incl, this); + } + + if (!src_incl.isEmpty()) { + f_src << src_incl; + + if (*p != '\n') + f_src << '\n'; + } + else if (*p == '\n') + p += 1; + } + else if (!strncmp(p, "${members}", 10)) { + p += 10; + + for (index = 0; index != n; index += 1) + cls[index]->generate_def(f_src, current_indent(p, srcdef), FALSE); + + if (*p == '\n') + p += 1; + } + else if (!strncmp(p, "${namespace_start}", 18)) { + p += 18; + + if (!nasp_start.isEmpty()) + f_src << nasp_start; + + if (*p == '\n') + p += 1; + } + else if (!strncmp(p, "${namespace_end}", 16)) { + p += 16; + + if (!nasp_end.isEmpty()) + f_src << nasp_end; + + if (*p == '\n') + p += 1; + } + else + // strange + f_src << toLocale(p); + } + + f_src << '\000'; + f_src.flush(); + + if (must_be_saved(src_path, file->data())) { + write_trace_header(); + + FILE * fp_src; + + if ((fp_src = fopen((const char *) src_path, "wb")) == 0) { + write_trace_header(); + UmlCom::trace(WrapperStr(" ") + + name + " : cannot open " + + src_path + ", edit the generation settings (tab directory) or the " + + pack->name() + " C++ directory specification
"); + incr_error(); + } + else { + fputs((const char *) file->data(), fp_src); + fclose(fp_src); + } + } + else if (get_trace_header().isEmpty()) + UmlCom::trace(WrapperStr(" ") + + src_path + " not modified
"); + } + } +} + +void UmlArtifact::generate_text() +{ + const WrapperStr srcdef = cppSource(); + + if (srcdef.isEmpty()) { + if (verbose()) + UmlCom::trace(WrapperStr("
artifact ") + + name() + " has an empty C++ definition
"); + + return; + } + + UmlPackage * pack = package(); + const WrapperStr & name = UmlArtifact::name(); + WrapperStr src_path = pack->text_path(name); + + WrapperStr s = " in " + src_path + ""; + + UmlCom::message(name); + + if (verbose()) + UmlCom::trace(WrapperStr("
Generate code for ") + + name + "" + s + "
"); + else + set_trace_header(WrapperStr("Generate code for ") + + name + "" + s + "
"); + + if (must_be_saved(src_path, (const char *) srcdef)) { + write_trace_header(); + + FILE * fp_src; + + if ((fp_src = fopen((const char *) src_path, "wb")) == 0) { + write_trace_header(); + UmlCom::trace(WrapperStr(" ") + + name + " : cannot open " + + src_path + ", edit the generation settings (tab directory) or the " + + pack->name() + " C++ directory specification
"); + incr_error(); + } + else { + fputs((const char *) srcdef, fp_src); + fclose(fp_src); + } + } + else if (get_trace_header().isEmpty()) + UmlCom::trace(WrapperStr(" ") + + src_path + " not modified
"); +} + +UmlPackage * UmlArtifact::generation_package() +{ + return package_of_generated_artifact; +} + +bool UmlArtifact::must_be_saved(const char * path, const char * new_contains) +{ + FILE * fp = fopen(path, "rb"); + + if (fp == 0) + return TRUE; + + int c; + + while ((c = fgetc(fp)) != EOF) { + if (((char) c) != *new_contains++) { + fclose(fp); + return TRUE; + } + } + + fclose(fp); + + return *new_contains != 0; +} diff --git a/src/CppGenerator/UmlPackage.cpp b/src/CppGenerator/UmlPackage.cpp index fe5966872..04626e2f8 100644 --- a/src/CppGenerator/UmlPackage.cpp +++ b/src/CppGenerator/UmlPackage.cpp @@ -206,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).toAscii(); 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(); @@ -244,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).toAscii(); 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(); diff --git a/src/CppGenerator/main.cpp b/src/CppGenerator/main.cpp index 7b8c0b9b0..02519d98b 100644 --- a/src/CppGenerator/main.cpp +++ b/src/CppGenerator/main.cpp @@ -57,7 +57,9 @@ int main(int argc, char ** argv) QTextCodec::setCodecForLocale(codec); QLOG_INFO() << " STARTING CPP_GENERATOR"; + #endif + //QTest::qSleep(7000); int port_index; if (argc == 2) { diff --git a/src/CppGenerator/util.cpp b/src/CppGenerator/util.cpp index d4e77211f..fa0e0a2d3 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 -//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("
" + 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 +//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); + QByteArray temp = indent.toAscii(); + 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("
" + 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/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 4bde0e90f..7b221ca4f 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1256,6 +1256,7 @@ BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name) // duplicates the sub elts for (child = firstChild(); n != 0; child = child->nextSibling(), n -= 1) { + BrowserNode* nodeCopy; if (!((BrowserNode *) child)->deletedp()) { if (IsaRelation(((BrowserNode *) child)->get_type())) @@ -1264,10 +1265,16 @@ BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name) ((BrowserNode *) child)->get_data(); if ((rd->get_start_class() != this) || (rd->get_end_class() != this) || rd->is_a((BrowserRelation *) child)) - ((BrowserNode *) child)->duplicate(result); + nodeCopy = ((BrowserNode *) child)->duplicate(result); } else - ((BrowserNode *) child)->duplicate(result); + nodeCopy = ((BrowserNode *) child)->duplicate(result); + } + nodeCopy->set_n_keys(static_cast(child)->get_n_keys()); + for(int i(0); i < static_cast(child)->get_n_keys(); i++) + { + nodeCopy->set_key(i, static_cast(child)->get_key(i)); + nodeCopy->set_value(i, static_cast(child)->get_value(i)); } } diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index 0672b7832..cf01b7562 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1124,28 +1124,42 @@ void BrowserNode::mark_management(int choice) break; case 5: // duplicate into - for (bn = marked_list.last(); - bn != 0; - bn = marked_list.prev()) + for (bn = marked_list.last();bn != 0; bn = marked_list.prev()) { BrowserNode* getOperCopy = nullptr; BrowserNode* setOperCopy = nullptr; if((BrowserNode *) bn->parent() != this) { BrowserNode* nodeCopy = bn->duplicate(this); - move(nodeCopy, this); + + nodeCopy->set_n_keys(bn->get_n_keys()); + for(int 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(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) { @@ -1193,7 +1207,16 @@ void BrowserNode::mark_management(int choice) for (bn = marked_list.last(); bn != 0; bn = marked_list.prev()) - p->move(bn->duplicate(p), this); + { + BrowserNode* nodeCopy = bn->duplicate(p); + nodeCopy->set_n_keys(bn->get_n_keys()); + for(int 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; #ifndef SIMPLE_DUPLICATION diff --git a/src/browser/BrowserPackage.cpp b/src/browser/BrowserPackage.cpp index c5db30282..885abdd7f 100644 --- a/src/browser/BrowserPackage.cpp +++ b/src/browser/BrowserPackage.cpp @@ -1,3227 +1,3228 @@ -// ************************************************************************* -// -// 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 -#include -#include -#include -#include -//Added by qt3to4: -#include -#include -#include -#include - -#include "BrowserPackage.h" -#include "PackageData.h" -#include "BrowserClassView.h" -#include "BrowserUseCaseView.h" -#include "BrowserClassDiagram.h" -#include "BrowserActivityDiagram.h" -#include "BrowserColDiagram.h" -#include "BrowserComponentDiagram.h" -#include "BrowserDeploymentDiagram.h" -#include "BrowserObjectDiagram.h" -#include "BrowserSeqDiagram.h" -#include "BrowserStateDiagram.h" -#include "BrowserUseCaseDiagram.h" -#include "BrowserClass.h" -#include "BrowserUseCase.h" -#include "BrowserView.h" -#include "BrowserAttribute.h" -#include "BrowserOperation.h" -#include "BrowserComponent.h" -#include "BrowserArtifact.h" -#include "BrowserDeploymentNode.h" -#include "BrowserComponentView.h" -#include "BrowserDeploymentView.h" -#include "BrowserSimpleRelation.h" -#include "BrowserState.h" -#include "BrowserPseudoState.h" -#include "BrowserStateAction.h" -#include "BrowserActivity.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 "StereotypesDialog.h" -#include "GenerationSettings.h" -#include "myio.h" -#include "ToolCom.h" -#include "Tool.h" -#include "ui/menufactory.h" -#include "UmlWindow.h" -#include "ReferenceDialog.h" -#include "UmlGlobal.h" -#include "mu.h" -#include "SaveProgress.h" -#include "DialogUtil.h" -#include "err.h" -#include "strutil.h" -#include "ProfiledStereotypes.h" -#include "translate.h" - -IdDict BrowserPackage::all(__FILE__); -Q3PtrList BrowserPackage::removed; - -QStringList BrowserPackage::its_default_stereotypes; // unicode -QStringList BrowserPackage::relation_default_stereotypes; // unicode - -BrowserPackage::BrowserPackage(QString s, BrowserView * parent, int id) - : BrowserNode(s, parent), Labeled(all, id), - def(new PackageData), associated_diagram(0), is_imported(FALSE) -{ - // creates the project package - is_modified = (id == 0); - def->set_browser_node(this); - revision = 1; - owner = -1; - - classdiagram_settings.hide_attributes = UmlNo; - classdiagram_settings.hide_operations = UmlNo; - classdiagram_settings.hide_getset_operations = UmlNo; - classdiagram_settings.show_full_members_definition = UmlNo; - classdiagram_settings.show_members_visibility = UmlNo; - classdiagram_settings.show_members_stereotype = UmlNo; - classdiagram_settings.show_members_context = noContext; - classdiagram_settings.show_members_multiplicity = UmlNo; - classdiagram_settings.show_members_initialization = UmlNo; - classdiagram_settings.show_attribute_modifiers = UmlNo; - classdiagram_settings.member_max_width = UmlUnlimitedMemberWidth; - classdiagram_settings.show_parameter_dir = UmlYes; - classdiagram_settings.show_parameter_name = UmlYes; - classdiagram_settings.package_name_in_tab = UmlNo; - classdiagram_settings.class_drawing_mode = Natural; - classdiagram_settings.drawing_language = UmlView; - classdiagram_settings.show_context_mode = noContext; - classdiagram_settings.auto_label_position = UmlYes; - classdiagram_settings.draw_all_relations = UmlYes; - classdiagram_settings.show_relation_modifiers = UmlNo; - classdiagram_settings.show_relation_visibility = UmlNo; - classdiagram_settings.show_infonote = UmlNo; - classdiagram_settings.shadow = UmlYes; - classdiagram_settings.show_stereotype_properties = UmlNo; - - class_settings.attribute_visibility = UmlPrivate; - class_settings.relation_visibility = UmlPrivate; - class_settings.operation_visibility = UmlPublic; - - usecasediagram_settings.package_name_in_tab = UmlNo; - usecasediagram_settings.show_context_mode = noContext; - usecasediagram_settings.auto_label_position = UmlYes; - usecasediagram_settings.draw_all_relations = UmlYes; - usecasediagram_settings.class_drawing_mode = asActor; - usecasediagram_settings.shadow = UmlYes; - usecasediagram_settings.show_stereotype_properties = UmlNo; - - sequencediagram_settings.show_full_operations_definition = UmlNo; - sequencediagram_settings.write_horizontally = UmlYes; - sequencediagram_settings.instances_drawing_mode = Natural; - sequencediagram_settings.drawing_language = UmlView; - sequencediagram_settings.draw_all_relations = UmlYes; - sequencediagram_settings.shadow = UmlYes; - sequencediagram_settings.show_stereotype_properties = UmlNo; - sequencediagram_settings.show_class_context_mode = noContext; - sequencediagram_settings.show_msg_context_mode = noContext; - - collaborationdiagram_settings.show_full_operations_definition = UmlNo; - collaborationdiagram_settings.show_hierarchical_rank = UmlNo; - collaborationdiagram_settings.write_horizontally = UmlYes; - collaborationdiagram_settings.drawing_language = UmlView; - collaborationdiagram_settings.package_name_in_tab = UmlNo; - collaborationdiagram_settings.show_class_pack_context_mode = noContext; - collaborationdiagram_settings.show_msg_context_mode = noContext; - collaborationdiagram_settings.draw_all_relations = UmlYes; - collaborationdiagram_settings.shadow = UmlYes; - collaborationdiagram_settings.show_stereotype_properties = UmlNo; - - objectdiagram_settings.write_horizontally = UmlYes; - objectdiagram_settings.package_name_in_tab = UmlNo; - objectdiagram_settings.show_class_pack_context_mode = noContext; - objectdiagram_settings.auto_label_position = UmlYes; - objectdiagram_settings.draw_all_relations = UmlYes; - objectdiagram_settings.shadow = UmlYes; - objectdiagram_settings.show_stereotype_properties = UmlNo; - - componentdiagram_settings.package_name_in_tab = UmlNo; - componentdiagram_settings.show_context_mode = noContext; - componentdiagram_settings.auto_label_position = UmlYes; - componentdiagram_settings.draw_all_relations = UmlYes; - componentdiagram_settings.shadow = UmlYes; - componentdiagram_settings.componentdrawingsettings.draw_component_as_icon = UmlNo; - componentdiagram_settings.componentdrawingsettings.show_component_req_prov = UmlNo; - componentdiagram_settings.componentdrawingsettings.show_component_rea = UmlNo; - componentdiagram_settings.componentdrawingsettings.show_stereotype_properties = UmlNo; - - deploymentdiagram_settings.package_name_in_tab = UmlNo; - deploymentdiagram_settings.show_context_mode = noContext; - deploymentdiagram_settings.write_horizontally = UmlYes; - deploymentdiagram_settings.auto_label_position = UmlYes; - deploymentdiagram_settings.draw_all_relations = UmlYes; - deploymentdiagram_settings.shadow = UmlYes; - deploymentdiagram_settings.componentdrawingsettings.draw_component_as_icon = UmlNo; - deploymentdiagram_settings.componentdrawingsettings.show_component_req_prov = UmlNo; - deploymentdiagram_settings.componentdrawingsettings.show_component_rea = UmlNo; - deploymentdiagram_settings.componentdrawingsettings.show_stereotype_properties = UmlNo; - - statediagram_settings.package_name_in_tab = UmlNo; - statediagram_settings.show_context_mode = noContext; - statediagram_settings.auto_label_position = UmlYes; - statediagram_settings.write_label_horizontally = UmlYes; - statediagram_settings.show_trans_definition = UmlNo; - statediagram_settings.draw_all_relations = UmlYes; - statediagram_settings.shadow = UmlYes; - statediagram_settings.statedrawingsettings.show_activities = UmlYes; - statediagram_settings.statedrawingsettings.region_horizontally = UmlYes; - statediagram_settings.statedrawingsettings.drawing_language = UmlView; - statediagram_settings.statedrawingsettings.show_stereotype_properties = UmlNo; - - activitydiagram_settings.package_name_in_tab = UmlNo; - activitydiagram_settings.show_context_mode = noContext; - activitydiagram_settings.show_opaque_action_definition = UmlNo; - activitydiagram_settings.auto_label_position = UmlYes; - activitydiagram_settings.write_label_horizontally = UmlNo; - activitydiagram_settings.draw_all_relations = UmlYes; - activitydiagram_settings.shadow = UmlYes; - activitydiagram_settings.activitydrawingsettings.show_infonote = UmlYes; - activitydiagram_settings.activitydrawingsettings.drawing_language = UmlView; - activitydiagram_settings.activitydrawingsettings.show_stereotype_properties = UmlNo; - - class_color = UmlYellow; - package_color = UmlTransparent; - fragment_color = UmlTransparent; - subject_color = UmlTransparent; - note_color = UmlBlue; - usecase_color = UmlYellow; - component_color = UmlGreen; - artifact_color = UmlGreen; - deploymentnode_color = UmlGray; - duration_color = UmlTransparent; - continuation_color = UmlGray; - state_color = UmlYellow; - stateaction_color = UmlTransparent; - activity_color = UmlTransparent; - activityregion_color = UmlTransparent; - activitypartition_color = UmlTransparent; - activityaction_color = UmlTransparent; - parameterpin_color = UmlWhite; -} - -BrowserPackage::BrowserPackage(QString s, BrowserNode * parent, int id) - : BrowserNode(s, parent), Labeled(all, id), - def(new PackageData), associated_diagram(0), is_imported(FALSE) -{ - make(); - is_modified = (id == 0); - revision = 1; - owner = -1; -} - -BrowserPackage::BrowserPackage(const BrowserPackage * model, - BrowserNode * p) - : BrowserNode(model->name, p), Labeled(all, 0) -{ - def = new PackageData(model->def); - def->set_browser_node(this); - comment = model->comment; - classdiagram_settings = model->classdiagram_settings; - class_settings = model->class_settings; - usecasediagram_settings = model->usecasediagram_settings; - sequencediagram_settings = model->sequencediagram_settings; - collaborationdiagram_settings = model->collaborationdiagram_settings; - objectdiagram_settings = model->objectdiagram_settings; - componentdiagram_settings = model->componentdiagram_settings; - deploymentdiagram_settings = model->deploymentdiagram_settings; - statediagram_settings = model->statediagram_settings; - activitydiagram_settings = model->activitydiagram_settings; - class_color = model->class_color; - package_color = model->package_color; - note_color = model->note_color; - fragment_color = model->fragment_color; - subject_color = model->subject_color; - usecase_color = model->usecase_color; - component_color = model->component_color; - artifact_color = model->artifact_color; - deploymentnode_color = model->deploymentnode_color; - duration_color = model->duration_color; - continuation_color = model->continuation_color; - state_color = model->state_color; - stateaction_color = model->stateaction_color; - activity_color = model->activity_color; - activityregion_color = model->activityregion_color; - activitypartition_color = model->activitypartition_color; - activityaction_color = model->activityaction_color; - parameterpin_color = model->parameterpin_color; - - is_modified = true; - revision = 1; - owner = -1; -} - -BrowserPackage::BrowserPackage(int id) - : Labeled(all, id), - def(new PackageData), associated_diagram(0), is_imported(FALSE) -{ - make(); - is_modified = (id == 0); - revision = 1; - owner = -1; -} - -BrowserPackage::~BrowserPackage() -{ - if (this == BrowserView::get_project()) { - // to accelerate removals - removed.clear(); - clear(FALSE); - } - else { - if (deletedp() && !modifiedp()) { - QString fn; - - fn.sprintf("%d", get_ident()); - - QDir d = BrowserView::get_dir(); - - QFile::remove(d.absFilePath(fn)); - } - - removed.remove(this); - all.remove(get_ident()); - } - - delete def; -} - -void BrowserPackage::make() -{ - def->set_browser_node(this); - - class_color = UmlDefaultColor; - note_color = UmlDefaultColor; - package_color = UmlDefaultColor; - fragment_color = UmlDefaultColor; - subject_color = UmlDefaultColor; - duration_color = UmlDefaultColor; - continuation_color = UmlDefaultColor; - usecase_color = UmlDefaultColor; - component_color = UmlDefaultColor; - artifact_color = UmlDefaultColor; - deploymentnode_color = UmlDefaultColor; - state_color = UmlDefaultColor; - stateaction_color = UmlDefaultColor; - activity_color = UmlDefaultColor; - activityregion_color = UmlDefaultColor; - activitypartition_color = UmlDefaultColor; - activityaction_color = UmlDefaultColor; - parameterpin_color = UmlDefaultColor; -} - -BrowserNode * BrowserPackage::duplicate(BrowserNode * p, QString name) -{ - BrowserPackage * result = new BrowserPackage(this, p); - - result->set_name((name.isEmpty()) ? get_name() : name); - result->update_stereotype(); - - return result; -} - -void BrowserPackage::clear(bool old) -{ - if (! old) - set_user_id(-1); - - all.clear(old); - BrowserClassView::clear(old); - BrowserUseCaseView::clear(old); - BrowserComponentView::clear(old); - BrowserDeploymentView::clear(old); - BrowserDiagram::clear(old); - - if (! old) - check_ids_cleared(); -} - -void BrowserPackage::update_idmax_for_root() -{ - all.update_idmax_for_root(); - BrowserClassView::update_idmax_for_root(); - BrowserUseCaseView::update_idmax_for_root(); - BrowserComponentView::update_idmax_for_root(); - BrowserDeploymentView::update_idmax_for_root(); - BrowserDiagram::update_idmax_for_root(); -} - -void BrowserPackage::prepare_update_lib() const -{ - all.memo_id_oid(get_ident(), original_id); - - for (Q3ListViewItem * child = firstChild(); - child != 0; - child = child->nextSibling()) - ((BrowserNode *) child)->prepare_update_lib(); -} - -void BrowserPackage::support_file(Q3Dict & files, bool add) const -{ - QString s; - - s.setNum(get_ident()); - - if (add) - files.insert(s, (char *) 1); - else - files.remove(s); - - for (Q3ListViewItem * child = firstChild(); - child != 0; - child = child->nextSibling()) - ((BrowserNode *) child)->support_file(files, add); -} - -void BrowserPackage::referenced_by(Q3PtrList & 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"); - BrowserComponentDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); - BrowserDeploymentDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); - BrowserObjectDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); - BrowserSeqDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); - BrowserStateDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); - BrowserUseCaseDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); - } -} - -const QPixmap * BrowserPackage::pixmap(int) const -{ - if (this == BrowserView::get_project()) - return 0; - - const char * st = def->get_stereotype(); - - if (strcmp(st, "profile") == 0) - return ((deletedp()) ? DeletedProfileIcon : ProfileIcon); - - if (deletedp()) - return DeletedPackageIcon; - - const QPixmap * px = ProfiledStereotypes::browserPixmap(st); - - return (px != 0) ? px : PackageIcon; -} - -void BrowserPackage::iconChanged() -{ - repaint(); - def->modified(); -} - -void BrowserPackage::update_stereotype(bool rec) -{ - if (def != 0) { - const char * stereotype = def->get_stereotype(); - - if (show_stereotypes && - stereotype[0] && - (strcmp(stereotype, "profile") != 0)) { - QString s = QString(QLatin1String(stereotype)); - int index = s.find(':'); - - setText(0, - "<<" + ((index == -1) ? s : s.mid(index + 1)) - + ">> " + name); - } - else - setText(0, name); - } - - if (rec) { - Q3ListViewItem * child; - - for (child = firstChild(); child != 0; child = child->nextSibling()) - ((BrowserNode *) child)->update_stereotype(TRUE); - } -} - -QString BrowserPackage::full_name(bool rev, bool) const -{ - if (!rev && !full_path.isEmpty()) - return full_path; - - if (this == BrowserView::get_project()) - return QString(); - - QString p = ((BrowserNode *) parent())->full_name(FALSE, FALSE); - - if (p.isEmpty()) - full_path = name; - else if (rev) - return name + (FullPathPrefix + p + FullPathPostfix); - else - full_path = (p + (FullPathDotDot + name)); - - return full_path; -} - -void BrowserPackage::prepare_for_sort() -{ - IdIterator it(all); - - while (it.current() != 0) { - it.current()->full_path = QString(); - ++it; - } -} - -// just check if the inheritance already exist -QString BrowserPackage::check_inherit(const BrowserNode * new_parent) const -{ - Q3ListViewItem * 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"); - } - - return (new_parent != this) ? QString() : 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); - bool isprofile = (strcmp(def->get_stereotype(), "profile") == 0); - - MenuFactory::createTitle(m, def->definition(FALSE, TRUE)); - m.insertSeparator(); - - if (!deletedp()) { - if (!is_read_only && (edition_number == 0)) { - m.setWhatsThis(m.insertItem(TR("New package"), 0), - TR("to add a new sub package")); - m.setWhatsThis(m.insertItem(TR("New use case view"), 1), - TR("to add a new use case view")); - - if (isprofile) - m.setWhatsThis(m.insertItem(TR("New class/stereotype view"), 2), - TR("to add a new class/stereotype view")); - else { - m.setWhatsThis(m.insertItem(TR("New class view"), 2), - TR("to add a new class view")); - m.setWhatsThis(m.insertItem(TR("New component view"), 3), - TR("to add a new class view")); - m.setWhatsThis(m.insertItem(TR("New deployment view"), 4), - TR("to add a new deployment view")); - } - - m.setWhatsThis(m.insertItem(TR("New profile"), 15), - TR("to add a new profile")); - m.insertSeparator(); - m.setWhatsThis(m.insertItem(TR("Import project"), 14), - TR("to import the contents of a project under \ - the current package")); - m.setWhatsThis(m.insertItem(TR("Import project as library"), 16), - TR("to import the contents of a project under \ - the current package 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 project")); - m.insertSeparator(); - } - - m.setWhatsThis(m.insertItem(TR("Edit"), 5), - TR("to edit the package")); - - if (!is_read_only) { - m.insertSeparator(); - - 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")); - } - - 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 diagrams'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")); - } - - if ((edition_number == 0) && (this != BrowserView::get_project())) { - m.insertSeparator(); - m.setWhatsThis(m.insertItem(TR("Delete"), 10), - TR("to delete the package 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 package 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 package \ - through a relation")); - mark_menu(m, TR("the package"), 90); - ProfiledStereotypes::menu(m, this, 99990); - - if (! isprofile) { - bool cpp = GenerationSettings::cpp_get_default_defs(); - bool java = GenerationSettings::java_get_default_defs(); - bool php = GenerationSettings::php_get_default_defs(); - bool python = GenerationSettings::python_get_default_defs(); - bool idl = GenerationSettings::idl_get_default_defs(); - - if (cpp || java || php || python || idl) { - m.insertSeparator(); - m.insertItem(TR("Generate"), &genm); - - if (cpp) - genm.insertItem("C++", 20); - - if (java) - genm.insertItem("Java", 21); - - if (php) - genm.insertItem("Php", 22); - - if (python) - genm.insertItem("Python", 34); - - if (idl) - genm.insertItem("Idl", 23); - } - - if (edition_number == 0) { - if (!is_read_only && (cpp || java || php || python)) { - m.insertItem(TR("Reverse"), &revm); - - if (cpp) - revm.insertItem("C++", 24); - - if (java) { - revm.insertItem("Java", 25); - revm.insertItem("Java Catalog", 26); - } - - if (php) - revm.insertItem("Php", 32); - -//#warning reverse python - - - if (java || cpp) { - m.insertItem(TR("Roundtrip"), &roundtripm); - - if (cpp) roundtripm.insertItem("C++", 38); - - if (java) roundtripm.insertItem("Java", 37); - } - - if (preserve_bodies()) { - m.insertItem(TR("Roundtrip body"), &roundtripbodym); - - if (cpp) - roundtripbodym.insertItem("C++", 30); - - if (java) - roundtripbodym.insertItem("Java", 31); - - if (php) - roundtripbodym.insertItem("Php", 33); - - if (python) - roundtripbodym.insertItem("Python", 36); - } - } - } - } - - if (Tool::menu_insert(&toolm, - (this == BrowserView::get_project()) ? UmlProject : UmlPackage, - 100)) { - m.insertSeparator(); - m.insertItem(TR("Tool"), &toolm); - } - } - else if (!is_read_only && (edition_number == 0)) { - m.setWhatsThis(m.insertItem(TR("Undelete"), 11), - TR("undelete the package. Do not undelete its sub items")); - m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 12), - TR("undelete the package and its sub items")); - } - - if (user_id() == 0) { - m.insertSeparator(); - m.insertSeparator(); - m.insertSeparator(); - m.insertSeparator(); - m.insertSeparator(); - - switch (phase_renumerotation) { - case -1: - if (this == BrowserView::get_project()) - m.insertItem("PREPARE la renumerotation", 27); - - break; - - case 0: - m.insertItem("Renumerotation BASE", 27); - break; - - case 1: - m.insertItem("Renumerotation USER", 27); - break; - } - } - - exec_menu_choice(m.exec(QCursor::pos())); -} - -static bool contain_profile(BrowserPackage * p) -{ - Q3ListViewItem * child; - - for (child = p->firstChild(); child != 0; child = child->nextSibling()) { - if (!((BrowserNode *) child)->deletedp() && - (((BrowserNode *) child)->get_type() == UmlPackage)) { - if (!strcmp(((BrowserNode *) child)->get_data()->get_stereotype(), "profile")) - return TRUE; - else if (contain_profile((BrowserPackage *) child)) - 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); - break; - - case 1: { - BrowserUseCaseView * v = - BrowserUseCaseView::add_use_case_view(this); - - if (v == 0) - return; - - v->select_in_browser(); - } - break; - - case 2: { - BrowserClassView * v = - BrowserClassView::add_class_view(this); - - if (v == 0) - return; - - v->select_in_browser(); - } - break; - - case 3: - if (isprofile) - return; - - { - BrowserComponentView * v = - BrowserComponentView::add_component_view(this); - - if (v == 0) - return; - - v->select_in_browser(); - } - break; - - case 4: - if (isprofile) - return; - - { - BrowserDeploymentView * v = - BrowserDeploymentView::add_deployment_view(this); - - if (v == 0) - return; - - v->select_in_browser(); - } - break; - - case 5: - def->edit(); - return; - - case 6: - edit_stereotypes(); - return; - - case 7: - edit_class_settings(); - return; - - case 8: - edit_gen_settings(); - return; - - case 9: - edit_drawing_settings(); - return; - - case 10: - if (!strcmp(get_data()->get_stereotype(), "profile")) { - bool propag = (msg_warning(TR("Question"), - TR("Propagate the removal of the profile ?"), - 1, 2) - == 1); - ProfiledStereotypes::deleted(this, propag); - delete_it(); - } - else { - bool recomp = ProfiledStereotypes::hasStereotype() && - contain_profile(this); - - delete_it(); - - if (recomp) - ProfiledStereotypes::recompute(FALSE); - } - - ((BrowserNode *) parent())->package_modified(); - break; - - case 11: - undelete(FALSE); - ProfiledStereotypes::recompute(FALSE); - break; - - case 12: - undelete(TRUE); - ProfiledStereotypes::recompute(FALSE); - break; - - case 13: - ReferenceDialog::show(this); - return; - - case 14: - import_project(QString()); - return; - - case 15: - add_package(TRUE); - break; - - case 16: - import_project(QString(), TRUE); - break; - - case 17: - update_lib(); - return; - - case 18: - edit_rev_settings(); - return; - - case 20: - if (!isprofile) { - ToolCom::run((verbose_generation()) - ? ((preserve) ? "cpp_generator -v -p" : "cpp_generator -v") - : ((preserve) ? "cpp_generator -p" : "cpp_generator"), - this); - } - - return; - - case 21: - if (!isprofile) { - ToolCom::run((verbose_generation()) - ? ((preserve) ? "java_generator -v -p" : "java_generator -v") - : ((preserve) ? "java_generator -p" : "java_generator"), - this); - } - - return; - - case 22: - if (!isprofile) { - ToolCom::run((verbose_generation()) - ? ((preserve) ? "php_generator -v -p" : "php_generator -v") - : ((preserve) ? "php_generator -p" : "php_generator"), - this); - } - - return; - - case 34: - if (!isprofile) { - ToolCom::run((verbose_generation()) - ? ((preserve) ? "python_generator -v -p" : "python_generator -v") - : ((preserve) ? "python_generator -p" : "python_generator"), - this); - } - - return; - - case 23: - if (!isprofile) - ToolCom::run((verbose_generation()) ? "idl_generator -v" : "idl_generator", this); - - return; - - case 24: - if (!isprofile) - ToolCom::run("cpp_reverse", this); - - return; - - case 25: - if (!isprofile) - ToolCom::run("java_reverse", this); - - return; - - case 37: - if (!isprofile) - ToolCom::run("java_roundtrip", this); - - return; - - case 38: - if (!isprofile) - ToolCom::run("cpp_roundtrip", this); - - return; - - case 26: - if (!isprofile) - ToolCom::run("java_catalog", this); - - return; - - case 32: - if (!isprofile) - ToolCom::run("php_reverse", this); - - return; - - case 35: - if (!isprofile) - ToolCom::run("python_reverse", this); - - return; - - case 27: - renumber(phase_renumerotation++); - - if (phase_renumerotation == 2) { - - renumber(2); - - save_all(FALSE); - QApplication::exit(); - } - - return; - - case 28: - if (!GenerationSettings::import()) - return; - - break; - - case 29: - if (!import_stereotypes()) - return; - - break; - - case 30: - if (!isprofile) - ToolCom::run((verbose_generation()) ? "roundtrip_body -v c++" : "roundtrip_body c++", this); - - return; - - case 31: - if (!isprofile) - ToolCom::run((verbose_generation()) ? "roundtrip_body -v java" : "roundtrip_body java", this); - - return; - - case 33: - if (!isprofile) - ToolCom::run((verbose_generation()) ? "roundtrip_body -v php" : "roundtrip_body php", this); - - return; - - case 36: - if (!isprofile) - ToolCom::run((verbose_generation()) ? "roundtrip_body -v python" : "roundtrip_body python", this); - - return; - - 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); - - return; - } - - package_modified(); -} - -void BrowserPackage::apply_shortcut(QString s) -{ - int choice = -1; - - if (!deletedp()) { - if (!is_read_only && (edition_number == 0)) { - if (s == "New package") - choice = 0; - else if (s == "New use case view") - choice = 1; - else if (s == "New class view") - choice = 2; - else if (s == "New component view") - choice = 3; - else if (s == "New deployment view") - choice = 4; - } - - if (!is_edited) { - if (s == "Edit") - choice = 5; - - if (!is_read_only) { - if (this == BrowserView::get_project()) { - if (s == "Edit generation settings") - choice = 8; - else if (s == "Edit reverse/roundtrip settings") - choice = 18; - else if (s == "Edit default stereotypes") - choice = 6; - } - - if (s == "Edit class settings") - choice = 7; - else if (s == "Edit drawing settings") - choice = 9; - - if ((edition_number == 0) && (this != BrowserView::get_project())) { - if (s == "Delete") - choice = 10; - } - } - else if ((s == "Delete") && - (edition_number == 0) && - is_from_lib() && - !((BrowserPackage *) parent())->is_from_lib() && - !((BrowserPackage *) parent())->is_read_only) - choice = 10; - } - - if (s == "Referenced by") - choice = 13; - else - mark_shortcut(s, choice, 90); - - if (choice == -1) { - if (s == "Generate C++") - choice = 20; - else if (s == "Generate Java") - choice = 21; - else if (s == "Generate Php") - choice = 22; - else if (s == "Generate Python") - choice = 34; - else if (s == "Generate Idl") - choice = 23; - else if (preserve_bodies()) { - if (s == "Roundtrip C++ operation body") - choice = 30; - else if (s == "Roundtrip Java operation body") - choice = 31; - else if (s == "Roundtrip Php operation body") - choice = 32; - else if (s == "Roundtrip Python operation body") - choice = 35; - } - - if ((choice == -1) && (edition_number == 0)) - Tool::shortcut(s, choice, get_type(), 100); - } - } - else if (!is_read_only && (edition_number == 0)) { - if (s == "Undelete") - choice = 11; - else if (s == "Undelete recursively") - choice = 12; - } - - exec_menu_choice(choice); -} - -void BrowserPackage::edit_gen_settings() -{ - if (GenerationSettings::edit()) - package_modified(); -} - -void BrowserPackage::edit_rev_settings() -{ - RevSettingsDialog d; - - d.raise(); - - if (d.exec()) - package_modified(); -} - -void BrowserPackage::edit_stereotypes() -{ - StereotypesDialog d; - - d.raise(); - - if (d.exec()) - package_modified(); -} - -void BrowserPackage::edit_class_settings() -{ - if (class_settings.edit((this == BrowserView::get_project()) - ? UmlProject : UmlPackage)) - package_modified(); -} - -void BrowserPackage::edit_drawing_settings() -{ - for (;;) { - StateSpecVector st; - ColorSpecVector co(18); - - classdiagram_settings.complete(st, UmlClassView); - sequencediagram_settings.complete(st, FALSE); - collaborationdiagram_settings.complete(st, FALSE); - objectdiagram_settings.complete(st, FALSE); - usecasediagram_settings.complete(st, FALSE); - componentdiagram_settings.complete(st, FALSE); - deploymentdiagram_settings.complete(st, FALSE); - statediagram_settings.complete(st, FALSE); - activitydiagram_settings.complete(st, FALSE); - - co[0].set(TR("class color"), &class_color); - co[1].set(TR("note color"), ¬e_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"), ¶meterpin_color); - - SettingsDialog dialog(&st, &co, this == BrowserView::get_project()); - - dialog.raise(); - - if (dialog.exec() == QDialog::Accepted) { - DrawingSettings::modified(); - package_modified(); - } - - if (!dialog.redo()) - break; - } -} - - -BrowserNodeList & BrowserPackage::instances(BrowserNodeList & result) -{ - IdIterator it(all); - - while (it.current() != 0) { - if (!it.current()->deletedp()) { - it.current()->full_path = QString(); - result.append(it.current()); - } - - ++it; - } - - result.sort_it(); - - return result; -} - -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 : "), - 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 : "), - UmlPackage, TRUE, FALSE)) { - BrowserPackage * p = new BrowserPackage(name, this); - - if (profile) - p->def->set_stereotype("profile"); - - p->select_in_browser(); - - 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)"), - QMessageBox::Yes, QMessageBox::No) - == QMessageBox::Yes)) - p->owner = owner; - } -} - -BrowserPackage * BrowserPackage::import_project(QString fn, bool aslib, int id) -{ - bool manual = fn.isEmpty(); - - if (manual) { - fn = Q3FileDialog::getOpenFileName(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")) - 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")); - - return 0; - } - - QApplication::setOverrideCursor(Qt::waitCursor); - QDir di(fi.dirPath(TRUE)); - - BrowserPackage * p = new BrowserPackage(bname, this, id); - bool err = FALSE; - unsigned fileformat = 0; - - set_in_import(TRUE, aslib); - BrowserView::set_imported_project(di, p); - BrowserNode::pre_load(); - - PRE_TRY; - - try { - fileformat = p->load(TRUE); - } - catch (int) { - err = TRUE; - } - - POST_TRY; - - if (! err) { - if (GenerationSettings::add_class_rel_correspondences(fileformat)) - Tool::add(); - } - - BrowserNode::post_load(FALSE); - idmax_add_margin(); - BrowserDiagram::import(); - BrowserView::set_imported_project(di, 0); - set_in_import(FALSE); - clear(TRUE); - - if (err) { - p->delete_it(); - delete p; - p = 0; - } - else - 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"), - QMessageBox::Yes, QMessageBox::Cancel) - != QMessageBox::Yes) - return; - - UmlWindow::save_it(); - } - - Q3Dict files; - - support_file(files, TRUE); - - Q3DictIterator it(files); - QDir d = BrowserView::get_dir(); - - while (it.current()) { - QFileInfo fi(d, it.currentKey()); - - if (!fi.exists()) - files.remove(it.currentKey()); // update it - else if (!fi.isWritable()) { - msg_critical(TR("Error"), TR("file '%1' is read only, update aborted", it.currentKey())); - files.clear(); - return; - } - else - ++it; - } - - QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), name + ".prj"); - - if (fn.isEmpty()) - return; - - QFileInfo fi(fn); - - if (my_baseName(fi) != name) { - msg_critical(TR("Error"), TR("you didn't select project '%1'", name)); - return; - } - - BrowserPackage * container = (BrowserPackage *) parent(); - Q3ListViewItem * previous = 0; - Q3ListViewItem * child = container->firstChild(); - - while (this != child) { - previous = child; - child = child->nextSibling(); - } - - prepare_update_lib(); - container->takeItem(this); - - BrowserPackage * updated = container->import_project(fn, TRUE, get_ident()); - - updated->original_id = original_id; - updated->support_file(files, FALSE); - it.toFirst(); - - for (; it.current(); ++it) - QFile::remove(d.absFilePath(it.currentKey())); - - if (previous != 0) - updated->moveItem(previous); - else - container->insertItem(updated); - - updated->select_in_browser(); - - UmlWindow::save_it(); - container->insertItem(this); - UmlWindow::reload_it(); -} - -UmlCode BrowserPackage::get_type() const -{ - return UmlPackage; -} - -QString BrowserPackage::get_stype() const -{ - return TR("package"); -} - -int BrowserPackage::get_identifier() const -{ - return get_ident(); -} - -const char * BrowserPackage::help_topic() const -{ - return (!strcmp(def->get_stereotype(), "profile")) - ? "profile" - : "package"; -} - -BasicData * BrowserPackage::get_data() const -{ - return def; -} - -void BrowserPackage::get_classdiagramsettings(ClassDiagramSettings & r) const -{ - if (! classdiagram_settings.complete(r)) - ((BrowserNode *) parent())->get_classdiagramsettings(r); -} - -void BrowserPackage::get_sequencediagramsettings(SequenceDiagramSettings & r) const -{ - if (! sequencediagram_settings.complete(r)) - ((BrowserNode *) parent())->get_sequencediagramsettings(r); -} - -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) { - case UmlClass: - c = class_color; - break; - - case UmlNote: - c = note_color; - break; - - case UmlFragment: - c = fragment_color; - break; - - case UmlSubject: - c = subject_color; - break; - - case UmlUseCase: - c = usecase_color; - break; - - case UmlComponent: - c = component_color; - break; - - case UmlArtifact: - c = artifact_color; - break; - - case UmlDeploymentNode: - c = deploymentnode_color; - break; - - case UmlContinuation: - c = continuation_color; - break; - - case UmlActivityDuration: - c = duration_color; - break; - - case UmlState: - c = state_color; - break; - - case UmlStateAction: - c = stateaction_color; - break; - - case UmlActivity: - c = activity_color; - break; - - case UmlInterruptibleActivityRegion: - case UmlExpansionRegion: - c = activityregion_color; - break; - - case UmlActivityPartition: - c = activitypartition_color; - break; - - case UmlActivityAction: - c = activityaction_color; - break; - - case UmlExpansionNode: - case UmlParameter: - case UmlActivityPin: - c = parameterpin_color; - break; - - default: // UmlPackage: - c = package_color; - break; - } - - return (c != UmlDefaultColor) - ? c - : ((BrowserNode *) parent())->get_color(who); -} - -UmlVisibility BrowserPackage::get_visibility(UmlCode who) const -{ - UmlVisibility v; - - switch (who) { - case UmlAttribute: - v = class_settings.attribute_visibility; - break; - - case UmlRelations: - v = class_settings.relation_visibility; - break; - - default: // UmlOperation - v = class_settings.operation_visibility; - break; - } - - return (v != UmlDefaultVisibility) - ? v - : ((BrowserNode *) parent())->get_visibility(who); -} - -void BrowserPackage::open(bool force_edit) -{ - if (!force_edit && - (associated_diagram != 0) && - !associated_diagram->deletedp()) - associated_diagram->open(FALSE); - else if (!is_edited) - def->edit(); -} - -void BrowserPackage::on_close() -{ -} - -BrowserNode * BrowserPackage::get_associated() const -{ - return associated_diagram; -} - -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()), - def, SLOT(on_delete())); - - if ((associated_diagram = dg) != 0) - QObject::connect(associated_diagram->get_data(), SIGNAL(deleted()), - def, SLOT(on_delete())); - - if (! on_read) - package_modified(); - } -} - -void BrowserPackage::on_delete() -{ - if (associated_diagram && associated_diagram->deletedp()) - associated_diagram = 0; -} - -void BrowserPackage::write_id(ToolCom * com) -{ - // to manage project case as any package - com->write_id(this, UmlPackage - UmlRelations, name); -} - -// connexion by a flow or a dependency -QString BrowserPackage::may_connect(UmlCode & l, const BrowserNode * dest) const -{ - switch (dest->get_type()) { - case UmlPackage: - switch (l) { - case UmlDependency: - l = UmlDependOn; - - //no break; - case UmlDependOn: - return 0; - - case UmlGeneralisation: - l = UmlInherit; - - // no break; - case UmlInherit: - return check_inherit(dest); - - default: - return TR("illegal"); - } - - case UmlActivity: - case UmlActivityAction: - case UmlActivityObject: - case UmlComponent: - case UmlArtifact: - case UmlClass: - switch (l) { - case UmlDependency: - l = UmlDependOn; - - //no break; - case UmlDependOn: - return 0; - - default: - return TR("illegal"); - } - - default: - return TR("illegal"); - } -} - -bool BrowserPackage::tool_cmd(ToolCom * com, const char * args) -{ - switch ((unsigned char) args[-1]) { - case supportFileCmd: { - QString fn; - - if (this == BrowserView::get_project()) - fn = name +"s.prj" ; - else - fn.setNum(get_ident()); - - QDir d = BrowserView::get_dir(); - - com->write_string(d.absFilePath(fn)); - } - - return TRUE; - - case createCmd: { - bool ok = TRUE; - - if (is_read_only && !root_permission()) - ok = FALSE; - else { - switch (com->get_kind(args)) { - case UmlPackage: - if (wrong_child_name(args, UmlPackage, TRUE, FALSE)) - ok = FALSE; - else - (new BrowserPackage(args, this))->write_id(com); - - break; - - case UmlSimpleRelations: { - UmlCode c; - - if (!com->get_relation_kind(c, args)) - ok = FALSE; - else { - BrowserNode * end = (BrowserNode *) com->get_id(args); - - if (may_connect(c, end).isEmpty()) - add_relation(c, end)->get_browser_node()->write_id(com); - else - ok = FALSE; - } - } - break; - - case UmlUseCaseView: - if (wrong_child_name(args, UmlUseCaseView, TRUE, FALSE)) - ok = FALSE; - else - (new BrowserUseCaseView(args, this))->write_id(com); - - break; - - case UmlClassView: - if (wrong_child_name(args, UmlClassView, TRUE, FALSE)) - ok = FALSE; - else - (new BrowserClassView(args, this))->write_id(com); - - break; - - case UmlComponentView: - if (wrong_child_name(args, UmlComponentView, TRUE, FALSE)) - ok = FALSE; - else - (new BrowserComponentView(args, this))->write_id(com); - - break; - - case UmlDeploymentView: - if (wrong_child_name(args, UmlDeploymentView, TRUE, FALSE)) - ok = FALSE; - else - (new BrowserDeploymentView(args, this))->write_id(com); - - break; - - default: - ok = FALSE; - } - } - - if (! ok) - com->write_id(0); - else - package_modified(); - - return TRUE; - } - break; - - case setAssocDiagramCmd: - if (is_read_only && !root_permission()) - com->write_ack(FALSE); - else { - set_associated_diagram((BrowserClassDiagram *) com->get_id(args)); - com->write_ack(TRUE); - } - - return TRUE; - - case importProjectCmd: - if (is_read_only && !root_permission()) - com->write_id(0); - else { - BrowserPackage * p = import_project(args, FALSE); - - if (p == 0) - com->write_id(0); - else - p->write_id(com); - } - - return TRUE; - - case old_deleteCmd: - case deleteCmd: - if ((is_read_only && !root_permission()) || - (parent() == 0) || - (((BrowserPackage *) parent())->is_read_only && !root_permission())) - com->write_ack(FALSE); - else { - delete_it(); - ((BrowserNode *) parent())->get_data()->modified(); - package_modified(); - ((BrowserNode *) parent())->package_modified(); - com->write_ack(TRUE); - } - - return TRUE; - - default: - return (def->tool_cmd(com, args, this, comment) || - BrowserNode::tool_cmd(com, args)); - } -} - -bool BrowserPackage::tool_global_cmd(ToolCom * com, const char * args) -{ - const WrapperStr & (PackageData::* pf)() const; - - switch ((unsigned char) args[-1]) { - case findCppNamespaceCmd: - pf = &PackageData::get_cpp_namespace; - break; - - case findJavaPackageCmd: - pf = &PackageData::get_java_package; - break; - - case findPhpNamespaceCmd: - pf = &PackageData::get_php_namespace; - break; - - case findIdlModuleCmd: - pf = &PackageData::get_idl_module; - break; - - case findPythonPackageCmd: - pf = &PackageData::get_python_package; - break; - - case getProjectCmd: - BrowserView::get_project()->write_id(com); - return TRUE; - - case isProjectModifiedCmd: - com->write_char(must_be_saved() != FALSE); - return TRUE; - - case saveProjectCmd: - UmlWindow::save_it(); - return TRUE; - - case updateProfileCmd: - ProfiledStereotypes::recompute(FALSE); - return TRUE; - - case findStereotypeCmd: { - bool case_sensitive; - - switch (*args) { - case 'y': - case_sensitive = TRUE; - args += 2; - break; - - case 'n': - case_sensitive = FALSE; - args += 2; - break; - - default: - // first pseudo definition for 4.2.1 - case_sensitive = (com->get_id(args) != 0); - } - - BrowserClass * r = ProfiledStereotypes::isModeled(args, case_sensitive); - - if (r == 0) - com->write_id(0); - else - r->write_id(com); - } - - return TRUE; - - default: - return FALSE; - } - - // search for a package/namespace/module - BrowserPackage * p = (BrowserPackage *) com->get_id(args); - - if (p == 0) - // old version - p = BrowserView::get_project(); - - if ((p = p->find_it(args, pf)) != 0) - p->write_id(com); - else - com->write_id(0); - - return TRUE; -} - -BrowserPackage * -BrowserPackage::find_it(const char * s, - const WrapperStr & (PackageData::* pf)() const) -{ - if (!deletedp()) { - if ((def->*pf)() == s) { - // find ! - return this; - } - else { - for (Q3ListViewItem * child = firstChild(); - child != 0; - child = child->nextSibling()) { - if (((BrowserNode *) child)->get_type() == UmlPackage) { - BrowserPackage * p = - ((BrowserPackage *) child)->find_it(s, pf); - - if (p != 0) - return p; - } - } - } - } - - return 0; -} - - -void BrowserPackage::DragMoveEvent(QDragMoveEvent * e) -{ - bool rel = UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)); - - if (rel || - UmlDrag::canDecode(e, UmlPackage) || - UmlDrag::canDecode(e, UmlUseCaseView) || - UmlDrag::canDecode(e, UmlClassView) || - UmlDrag::canDecode(e, UmlComponentView) || - UmlDrag::canDecode(e, UmlDeploymentView)) { - if (!is_read_only || - (!rel && (parent() != 0) && !((BrowserPackage *) parent())->is_read_only)) - e->accept(); - else - e->ignore(); - } - else if (parent() != 0) - ((BrowserNode *) parent())->DragMoveInsideEvent(e); - else - e->ignore(); -} - -void BrowserPackage::DragMoveInsideEvent(QDragMoveEvent * e) -{ - if (!is_read_only && - (UmlDrag::canDecode(e, UmlPackage) || - UmlDrag::canDecode(e, UmlUseCaseView) || - UmlDrag::canDecode(e, UmlClassView) || - UmlDrag::canDecode(e, UmlComponentView) || - UmlDrag::canDecode(e, UmlDeploymentView) || - UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)))) - e->accept(); - else - e->ignore(); -} - -bool BrowserPackage::may_contains_them(const Q3PtrList & l, - BooL & duplicable) const -{ - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { - switch (it.current()->get_type()) { - case UmlPackage: - case UmlUseCaseView: - case UmlClassView: - case UmlComponentView: - case UmlDeploymentView: - break; - - default: - if (!IsaSimpleRelation(it.current()->get_type()) || - (((const BrowserNode *) it.current()->parent()) != this)) - return FALSE; - } - - duplicable = FALSE; - - if (! may_contains(it.current(), FALSE)) - return FALSE; - } - - return TRUE; -} - -void BrowserPackage::DropEvent(QDropEvent * e) -{ - DropAfterEvent(e, 0); -} - -void BrowserPackage::DropAfterEvent(QDropEvent * e, BrowserNode * after) -{ - BrowserNode * bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this)); - bool rel = (bn != 0); - - if ((rel || - ((bn = UmlDrag::decode(e, UmlPackage)) != 0) || - ((bn = UmlDrag::decode(e, UmlUseCaseView)) != 0) || - ((bn = UmlDrag::decode(e, UmlClassView)) != 0) || - ((bn = UmlDrag::decode(e, UmlComponentView)) != 0) || - ((bn = UmlDrag::decode(e, UmlDeploymentView)) != 0)) && - (bn != after) && (bn != this)) { - UmlCode what = bn->get_type(); - - if (may_contains(bn, what == UmlPackage)) { - BrowserNode * x = this; - - if ((after == 0) && - !rel && - (parent() != 0) && - ((BrowserNode *) parent())->may_contains(bn, what == UmlPackage)) { - // have choice - Q3PopupMenu m(0); - - MenuFactory::createTitle(m, TR("move ") + bn->get_name()); - m.insertSeparator(); - - if (!is_read_only) - 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; - } - } - - BrowserNode * old_parent = (BrowserNode *) bn->parent(); - bool stereotype_moved = FALSE; - - if ((what == UmlClassView) && - (x != old_parent) && - !strcmp(old_parent->get_data()->get_stereotype(), "profile")) - stereotype_moved = ((BrowserClassView *) bn)->extract_from_profile(); - - if (after) - bn->moveItem(after); - else { - old_parent->takeItem(bn); - x->insertItem(bn); - } - - if (old_parent != x) { - if (stereotype_moved && - (what == UmlClassView) && - !strcmp(x->get_data()->get_stereotype(), "profile")) - ((BrowserClassView *) bn)->insert_in_profile(); - - old_parent->package_modified(); - bn->modified(); - } - - x->package_modified(); - } - else if ((parent() != 0) && (after == 0)) - ((BrowserNode *) parent())->DropAfterEvent(e, this); - else { - msg_critical(TR("Error"), TR("Forbidden")); - e->ignore(); - } - } - else if ((bn == 0) && (after == 0)) - ((BrowserNode *) parent())->DropAfterEvent(e, this); - else - e->ignore(); -} - -// stereotypes (unicode) - -const QStringList & BrowserPackage::default_stereotypes() -{ - return its_default_stereotypes; -} - -const QStringList & BrowserPackage::default_stereotypes(UmlCode, const BrowserNode *) const -{ - return relation_default_stereotypes; -} - -void BrowserPackage::init() -{ - its_default_stereotypes.clear(); - its_default_stereotypes.append("facade"); - its_default_stereotypes.append("framework"); - its_default_stereotypes.append("model library"); - its_default_stereotypes.append("stub"); - its_default_stereotypes.append("toplevel"); - its_default_stereotypes.append("profile"); - - relation_default_stereotypes.clear(); - relation_default_stereotypes.append("access"); - relation_default_stereotypes.append("import"); - relation_default_stereotypes.append("from"); -} - -void BrowserPackage::save_stereotypes() -{ - QSharedPointer newdef(new QByteArray()); - QTextStream st(newdef.data(), QIODevice::WriteOnly); - // QLOG_INFO() << newdef->data(); - st.setEncoding(QTextStream::Latin1); - // QLOG_INFO() << newdef->data(); - nl_indent(st); - st << "package_stereotypes "; - st.flush(); - QLOG_INFO() << newdef->data(); - save_unicode_string_list(its_default_stereotypes, st); - nl_indent(st); - st << " " << stringify(UmlDependency); - save_unicode_string_list(relation_default_stereotypes, st); - nl_indent(st); - st << "end"; - nl_indent(st); - - BrowserClass::save_stereotypes(st); - BrowserUseCase::save_stereotypes(st); - BrowserArtifact::save_stereotypes(st); - BrowserAttribute::save_stereotypes(st); - BrowserOperation::save_stereotypes(st); - BrowserState::save_stereotypes(st); - BrowserActivity::save_stereotypes(st); - BrowserFlow::save_stereotypes(st); - BrowserInterruptibleActivityRegion::save_stereotypes(st); - BrowserPseudoState::save_stereotypes(st); - BrowserStateAction::save_stereotypes(st); - BrowserParameter::save_stereotypes(st); - BrowserParameterSet::save_stereotypes(st); - BrowserActivityNode::save_stereotypes(st); - BrowserActivityAction::save_stereotypes(st); - BrowserActivityObject::save_stereotypes(st); - BrowserExpansionRegion::save_stereotypes(st); - BrowserActivityPartition::save_stereotypes(st); - BrowserPin::save_stereotypes(st); - BrowserComponent::save_stereotypes(st); - BrowserDeploymentNode::save_stereotypes(st); - BrowserClassView::save_stereotypes(st); - BrowserUseCaseView::save_stereotypes(st); - BrowserComponentView::save_stereotypes(st); - BrowserDeploymentView::save_stereotypes(st); - BrowserDiagram::save_stereotypes(st); - st << "\nend\n"; - - st << '\000'; - st.flush(); - QLOG_INFO() << newdef->data(); - save_if_needed("stereotypes", newdef); -} - -void BrowserPackage::read_stereotypes(char *& st, char *& k) -{ - if (!strcmp(k, "package_stereotypes")) { - read_unicode_string_list(its_default_stereotypes, st); - read_keyword(st, stringify(UmlDependency)); - read_unicode_string_list(relation_default_stereotypes, st); - read_keyword(st, "end"); - k = read_keyword(st); - - // force profile - if (its_default_stereotypes.findIndex("profile") == -1) - its_default_stereotypes.append("profile"); - } - else - init(); -} - -bool BrowserPackage::read_stereotypes(const char * f) -{ - char * s = read_file((f == 0) ? "stereotypes" : f); - - if (s != 0) { - PRE_TRY; - - try { - char * st = s; - char * k = read_keyword(st); - - 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 - BrowserOperation::read_stereotypes(st, k); // updates k - BrowserState::read_stereotypes(st, k); // updates k - BrowserActivity::read_stereotypes(st, k); // updates k - BrowserFlow::read_stereotypes(st, k); // updates k - BrowserInterruptibleActivityRegion::read_stereotypes(st, k); // updates k - BrowserPseudoState::read_stereotypes(st, k); // updates k - BrowserStateAction::read_stereotypes(st, k); // updates k - BrowserParameter::read_stereotypes(st, k); // updates k - BrowserParameterSet::read_stereotypes(st, k); // updates k - BrowserActivityNode::read_stereotypes(st, k); // updates k - BrowserActivityAction::read_stereotypes(st, k); // updates k - BrowserActivityObject::read_stereotypes(st, k); // updates k - BrowserExpansionRegion::read_stereotypes(st, k); // updates k - BrowserActivityPartition::read_stereotypes(st, k);// updates k - BrowserPin::read_stereotypes(st, k); // updates k - BrowserComponent::read_stereotypes(st, k); // updates k - BrowserDeploymentNode::read_stereotypes(st, k); // updates k - BrowserClassView::read_stereotypes(st, k); // updates k - BrowserUseCaseView::read_stereotypes(st, k); // updates k - BrowserComponentView::read_stereotypes(st, k); // updates k - BrowserDeploymentView::read_stereotypes(st, k); // updates k - BrowserDiagram::read_stereotypes(st, k); // updates k - } - catch (int) { - ; - } - - POST_TRY; - delete [] s; - return TRUE; - } - - return FALSE; -} - -bool BrowserPackage::import_stereotypes() -{ - QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), "stereotypes"); - - if (fn.isEmpty()) - return FALSE; - - set_last_used_directory(fn); - return read_stereotypes((const char *) fn); -} - -// save / restore - -void BrowserPackage::save(QTextStream & st, bool, QString &) -{ - // saves just its reference for its father - nl_indent(st); - st << "package_ref " << get_ident() << " // " << get_name(); -} - -// saves all (modified) packages - -void BrowserPackage::init_save_counter() -{ - // does nothing -} - -void BrowserPackage::save_all(bool modified_only) -{ - IdIterator itcpt(all); - - must_be_saved_counter = 0; - already_saved = 0; - - while (itcpt.current()) { - BrowserPackage * pack = itcpt.current(); - - if (!pack->deletedp() && - (!modified_only || - (pack->is_modified && - (pack->is_imported || !pack->is_read_only)))) - pack->BrowserNode::init_save_counter(); - - ++itcpt; - } - - if (must_be_saved_counter == 0) - return; - - save_progress = new SaveProgress(must_be_saved_counter); - - IdIterator it(all); - QDir d = BrowserView::get_dir(); - QString warning; - - while (it.current()) { - BrowserPackage * pack = it.current(); - bool prj = (pack == BrowserView::get_project()); - QString fn; - - if (prj) - fn = ((const char *) pack->name) + QString(".prj"); - else - fn.setNum(it.currentKey()); - - if (pack->deletedp()) { - pack->is_modified = FALSE; - backup(d, fn); - } - else if (!modified_only || - (pack->is_modified && - (pack->is_imported || !pack->is_read_only))) { - backup(d, fn); - - for (;;) { - QFile fp(d.absFilePath(fn)); - - while (!fp.open(QIODevice::WriteOnly)) - (void) msg_critical(TR("Error"), TR("Cannot create file\n") + fn, - QMessageBox::Retry); - - if (prj) - UmlWindow::historic_add(fp.name()); - - QTextStream st(&fp); - - st.setEncoding(QTextStream::Latin1); - - // saves the package own data - - indent0(); - st << "format " << api_format() << "\n"; - - save_string(pack->name, st); - - if (!prj) - st << " // " << (const char *) pack->full_name(); - - indent(+1); - - nl_indent(st); - st << "revision " << pack->revision; - nl_indent(st); - st << "modified_by " << user_id() - << " \"" << (const char *) user_name() << '"'; - - if (pack->owner != -1) { - // owner specified, the save is done => owner is current user ! - nl_indent(st); - st << "owner " << pack->owner << " "; - - if (pack->owner > 1) - save_string(user_name(), st); - } - - if (prj) { - GenerationSettings::save_dirs(st); - GenerationSettings::save_descriptions(st); - nl_indent(st); - save_stereotypes(); - GenerationSettings::save(); - Tool::save(); - } - - nl_indent(st); - st << "// class settings"; - pack->class_settings.save(st); - nl_indent(st); - st << "//class diagram settings"; - pack->classdiagram_settings.save(st); - nl_indent(st); - st << "//use case diagram settings"; - pack->usecasediagram_settings.save(st); - nl_indent(st); - st << "//sequence diagram settings"; - pack->sequencediagram_settings.save(st); - nl_indent(st); - st << "//collaboration diagram settings"; - pack->collaborationdiagram_settings.save(st); - nl_indent(st); - st << "//object diagram settings"; - pack->objectdiagram_settings.save(st); - nl_indent(st); - st << "//component diagram settings"; - pack->componentdiagram_settings.save(st); - nl_indent(st); - st << "//deployment diagram settings"; - pack->deploymentdiagram_settings.save(st); - nl_indent(st); - st << "//state diagram settings"; - pack->statediagram_settings.save(st); - nl_indent(st); - st << "//activity diagram settings"; - pack->activitydiagram_settings.save(st); - nl_indent(st); - - BooL nl = FALSE; - - save_color(st, "class_color", pack->class_color, nl); - save_color(st, "duration_color", pack->duration_color, nl); - save_color(st, "continuation_color", pack->continuation_color, nl); - save_color(st, "note_color", pack->note_color, nl); - save_color(st, "fragment_color", pack->fragment_color, nl); - save_color(st, "subject_color", pack->subject_color, nl); - save_color(st, "usecase_color", pack->usecase_color, nl); - save_color(st, "package_color", pack->package_color, nl); - save_color(st, "component_color", pack->component_color, nl); - save_color(st, "artifact_color", pack->component_color, nl); - save_color(st, "deploymentnode_color", pack->deploymentnode_color, nl); - save_color(st, "state_color", pack->state_color, nl); - save_color(st, "stateaction_color", pack->stateaction_color, nl); - save_color(st, "activity_color", pack->activity_color, nl); - save_color(st, "activityregion_color", pack->activityregion_color, nl); - save_color(st, "activitypartition_color", pack->activitypartition_color, nl); - save_color(st, "activityaction_color", pack->activityaction_color, nl); - save_color(st, "parameterpin_color", pack->parameterpin_color, nl); - - if (prj) { - nl_indent(st); - st << "font_size " << NormalFont.pointSize(); - nl_indent(st); - st << "diagram_format " - << stringify(UmlWindow::default_format()) << '\n'; - nl_indent(st); - st << "image_root_dir "; - save_string(fromUnicode(UmlWindow::images_root_dir()), st); - st << '\n'; - nl_indent(st); - st << "mark_for_import"; - nl_indent(st); - } - - pack->def->save(st, warning); - - if (pack->associated_diagram != 0) { - nl_indent(st); - st << "associated_diagram "; - pack->associated_diagram->save(st, TRUE, warning); - } - - pack->BrowserNode::save(st); - - // saves the package's sub elts - - Q3ListViewItem * child = pack->firstChild(); - - if (child != 0) { - for (;;) { - if (!((BrowserNode *) child)->deletedp()) { - ((BrowserNode *) child)->save(st, FALSE, warning); - child = child->nextSibling(); - - if (child != 0) - st << '\n'; - else - break; - } - else if ((child = child->nextSibling()) == 0) - break; - } - } - - if (prj) { - if (preserve_bodies()) - st << "\npreserve_bodies\n"; - else if (add_operation_profile()) - st << "\nadd_operation_profile\n"; - } - - st << "\nend\n"; - st.flush(); - - fp.close(); - - if (static_cast(fp.status()) == IO_Ok) { - pack->is_imported = pack->is_modified = FALSE; - - // for saveAs - if (!modified_only && !pack->is_from_lib() && !pack->is_api_base()) - pack->is_read_only = FALSE; - - // all done - break; - } - - (void) msg_critical(TR("Error"), - TR("Error while writting in\n%1\nmay be your disk is full", fn), - QMessageBox::Retry); - } - } - - ++it; - } - - if (save_progress != 0) - delete save_progress; - - if (!warning.isEmpty()) - warn(warning); - - delete_backup(d); -} - -bool BrowserPackage::must_be_saved() -{ - IdIterator it(all); - - while (it.current()) { - if (it.current()->is_modified && - !it.current()->deletedp() && - !it.current()->is_read_only) - return TRUE; - - ++it; - } - - return FALSE; -} - -void BrowserPackage::save_session(QTextStream & st) -{ - if (show_stereotypes) - st << "show_stereotypes\n"; - - QString warning; - - if (! marked_list.isEmpty()) { - Q3PtrListIterator it(marked_list); - - st << "marked\n"; - - for (; it.current() != 0; ++it) { - st << " "; - it.current()->save(st, TRUE, warning); - st << '\n'; - } - - st << "end\n"; - } - - BrowserNode * sel = (BrowserNode *) listView()->currentItem(); - - if ((sel != 0) && !sel->deletedp()) { - st << "selected "; - sel->save(st, TRUE, warning); - st << '\n'; - } - - if (isOpen()) { - Q3ListViewItem * child; - - st << "open\n"; - - for (child = firstChild(); child != 0; child = child->nextSibling()) { - BrowserNode * ch = ((BrowserNode *) child); - - if (!ch->deletedp()) - ch->save_open_list(st); - } - - st << "end\n"; - } - - if (!completion()) - st << "nocompletion\n"; - - st << "end\n"; -} - -static void open_it(Q3ListViewItem * bn) -{ - if (bn && !bn->isOpen()) { - open_it(bn->parent()); - bn->setOpen(TRUE); - } -} - -void BrowserPackage::read_session(char *& st, const char * k) -{ - if (!strcmp(k, "diagrams")) { - BrowserDiagram * active_one = 0; - - while (strcmp(k = read_keyword(st), "end")) { - bool active; - - if (!strcmp(k, "active")) { - active = TRUE; - k = read_keyword(st); - } - else - active = FALSE; - - BrowserDiagram * bn = (BrowserDiagram *) get_it(k, read_id(st)); - - if (bn != 0) { - ReadContext context = current_context(); - - bn->open(FALSE); - restore_context(context); - bn->read_session(st); - - if (active) - active_one = bn; - } - } - - if (active_one != 0) - active_one->open(FALSE); - - k = read_keyword(st); - } - - if (!strcmp(k, "show_stereotypes")) { - if (!show_stereotypes) - toggle_show_stereotypes(); - - k = read_keyword(st); - } - else if (show_stereotypes) - toggle_show_stereotypes(); - - if (!strcmp(k, "marked")) { - while (strcmp(k = read_keyword(st), "end")) { - BrowserNode * bn = get_it(k, read_id(st)); - - if (bn != 0) - bn->toggle_mark(); - } - - k = read_keyword(st); - } - - BrowserNode * sel; - - if (! strcmp(k, "selected")) { - k = read_keyword(st); - - sel = get_it(k, read_id(st)); - - k = read_keyword(st); - } - else - sel = 0; - - if (! strcmp(k, "open")) { - while (strcmp(k = read_keyword(st), "end")) - open_it(get_it(k, read_id(st))); - - k = read_keyword(st); - } - - if (! strcmp(k, "nocompletion")) { - set_completion(FALSE); - k = read_keyword(st); - } - else - set_completion(TRUE); - - if (sel != 0) { - listView()->setSelected(sel, TRUE); - listView()->ensureItemVisible(sel); - } - - // don't check old 'scroll n> ' or new 'end' -} - -BrowserNode * BrowserPackage::get_it(const char * k, int id) -{ - if (!strcmp(k, "package_ref")) - return all[id]; - - BrowserNode * r; - - 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 = 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; - 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); - 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; - - ReadContext context = current_context(); - - if ((sz = open_file(fp, QIODevice::ReadOnly)) != -1) { - char * s = new char[sz + 1]; - int offset = 0; - int 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")); - delete [] s; - THROW_ERROR 0; - } - - offset += nread; - } - while (offset != sz); - - s[sz] = 0; - - bool err = FALSE; - - PRE_TRY; - - try { - char * st = s; - char * k; - - read_keyword(st, "format"); - set_read_file_format(read_unsigned(st)); - - if (read_file_format() > api_format(true)) { - msg_critical("Error", - TR("Your version of DOUML is too old to read this project")); - throw 0; - } - - if (in_import() && prj) - { - result = read_file_format(); - - if (read_file_format() <= 21) { - msg_critical(TR("Error"), - TR( - "Sorry, the imported project has a too old format.\n" - "To change its format : load this project and save it.")); - throw 0; - } - - k = skip_until(st, "mark_for_import"); - } - else - { - set_name(read_string(st)); - - k = read_keyword(st); - - if (!strcmp(k, "revision")) { - revision = read_unsigned(st) + 1; - k = read_keyword(st); - - if (!strcmp(k, "modified_by")) { - read_keyword(st); - read_string(st); - k = read_keyword(st); - } - - if (! strcmp(k, "owner")) { - owner = read_unsigned(st); - - if (owner != user_id()) { - is_read_only = TRUE; - set_read_only_file(); - } - - if (owner > 1) - read_string(st); // owner's name - - k = read_keyword(st); - } - } - - if (prj) { - result = read_file_format(); - GenerationSettings::read_dirs(st, k); // updates k - GenerationSettings::read_descriptions(st, k); // updates k - - if (read_file_format() <= 6) - GenerationSettings::read(st, k); // updates k - - 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 - BrowserOperation::read_stereotypes(st, k); // updates k - BrowserComponent::read_stereotypes(st, k); // updates k - BrowserDeploymentNode::read_stereotypes(st, k); // updates k - BrowserClassView::read_stereotypes(st, k); // updates k - BrowserUseCaseView::read_stereotypes(st, k);// updates k - BrowserComponentView::read_stereotypes(st, k); // updates k - BrowserDeploymentView::read_stereotypes(st, k); // updates k - BrowserDiagram::read_stereotypes(st, k); // updates k - 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 - - if (read_file_format() >= 21) - statediagram_settings.read(st, k); // updates k - - 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) - classdiagram_settings.auto_label_position = UmlYes; - - if (usecasediagram_settings.auto_label_position == UmlDefaultState) - usecasediagram_settings.auto_label_position = UmlYes; - - if (componentdiagram_settings.auto_label_position == UmlDefaultState) - componentdiagram_settings.auto_label_position = UmlYes; - - if (deploymentdiagram_settings.auto_label_position == UmlDefaultState) - deploymentdiagram_settings.auto_label_position = UmlYes; - } - - read_color(st, "class_color", class_color, k); // updates k - read_color(st, "duration", duration_color, k); // old, updates k - read_color(st, "duration_color", duration_color, k); // updates k - read_color(st, "continuation_color", continuation_color, k); // updates k - read_color(st, "note_color", note_color, k); // updates k - read_color(st, "fragment_color", fragment_color, k); // updates k - read_color(st, "subject_color", subject_color, k); // updates k - read_color(st, "usecase_color", usecase_color, k); // updates k - read_color(st, "package_color", package_color, k); // updates k - read_color(st, "component_color", component_color, k); // updates k - read_color(st, "artifact_color", artifact_color, k); // updates k - read_color(st, "deploymentnode_color", deploymentnode_color, k); // updates k - read_color(st, "state_color", state_color, k); // updates k - read_color(st, "stateaction_color", stateaction_color, k); // updates k - read_color(st, "activity_color", activity_color, k); // updates k - read_color(st, "activityregion_color", activityregion_color, k); // updates k - read_color(st, "activitypartition_color", activitypartition_color, k); // updates k - read_color(st, "activityaction_color", activityaction_color, k); // updates k - read_color(st, "parameterpin_color", parameterpin_color, k); // updates k - } - - if (read_file_format() > 9) - { - if (prj) - { - if (!strcmp(k, "font_size")) { - resize_font((int) read_unsigned(st)); - k = read_keyword(st); - } - else - init_font(); - - if (!strcmp(k, "diagram_format")) { - UmlWindow::set_default_format(canvas_format(read_keyword(st))); - k = read_keyword(st); - } - else - UmlWindow::set_default_format(IsoA4); - - if (!strcmp(k, "image_root_dir")) { - UmlWindow::set_images_root_dir(toUnicode(read_string(st))); - k = read_keyword(st); - } - else - UmlWindow::set_images_root_dir(""); - - if (strcmp(k, "mark_for_import")) - wrong_keyword(k, "mark_for_import"); - - k = read_keyword(st); - } - - def->read(st, k); // updates k - } - else if (prj) - init_font(); - - if (!strcmp(k, "associated_class_diagram")) - { - // old format - set_associated_diagram(BrowserClassDiagram::read_ref(st, "classdiagram_ref"), - TRUE); - k = read_keyword(st); - } - else if (!strcmp(k, "associated_diagram")) - { - set_associated_diagram(BrowserDiagram::read_diagram_ref(st), TRUE); - k = read_keyword(st); - } - - BrowserNode::read(st, k, id); // updates k - - if (strcmp(k, "end")) - { - 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)) - k = read_keyword(st); - - if (!strcmp(k, "preserve_bodies")) - { - if (!in_import() && !preserve_bodies()) - toggle_preserve_bodies(); - - if (add_operation_profile()) - toggle_add_operation_profile(); - - k = read_keyword(st); - } - else - { - if (preserve_bodies()) - toggle_preserve_bodies(); - - if (!strcmp(k, "add_operation_profile")) { - if (!in_import() && !add_operation_profile()) - toggle_add_operation_profile(); - - k = read_keyword(st); - } - else if (add_operation_profile()) - toggle_add_operation_profile(); - } - - if (strcmp(k, "end")) - wrong_keyword(k, "end"); - } - } - catch (int) { - err = TRUE; - } - - POST_TRY; - - delete [] s; - - if (!err && (this == BrowserView::get_project())) { - Tool::read(); - - if (read_file_format() > 6) { - GenerationSettings::read(); - - if (read_file_format() > 7) - read_stereotypes(); - } - - GenerationSettings::read_includes_imports(); - } - - restore_context(context); - - if (err) { - THROW_ERROR 0; - } - } - else { - THROW_ERROR 0; - } - - is_imported = is_modified = in_import(); - - return result; -} - -bool BrowserPackage::load_version(QString fn) -{ - QFileInfo any_fi(fn); - QDir d(any_fi.dirPath(TRUE)); - const QFileInfoList l = d.entryInfoList("*.prj"); // [lgfreitas] entryInfoList does not return a pointer anymore - - if (!l.empty()) { - QListIterator it(l); - QFileInfo fi = it.next(); // [lgfreitas] there is no it.current anymore to QList. Java-style iterators - - if (fi.exists()) { - fn = fi.absFilePath(); - - char * s = read_file(fn); - - if (s == 0) { - msg_critical(TR("Error"), TR("can't read project file")); - return FALSE; - } - - bool ok = TRUE; - - PRE_TRY; - - try { - char * st = s; - - read_keyword(st, "format"); - 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")); - throw 0; - } - } - catch (int) { - ok = FALSE; - } - - POST_TRY; - - delete [] s; - - return ok; - } - } - - msg_critical(TR("Error"), TR("can't find project file")); - - return FALSE; -} - - -BrowserPackage * BrowserPackage::read_ref(char *& st) -{ - read_keyword(st, "package_ref"); - - int id = read_id(st); - BrowserPackage * result = all[id]; - - return (result == 0) - ? new BrowserPackage(id) - : result; -} - -BrowserPackage * BrowserPackage::read(char *& st, char * k, - BrowserNode * parent, - bool recursive) -{ - if (!strcmp(k, "package_ref")) { - int id = read_id(st); - - BrowserPackage * r = all[id]; - - if (r == 0) - r = (parent) - ? new BrowserPackage("", parent, id) - : new BrowserPackage(id); - else if (parent != 0) { - r->set_parent(parent); - r->set_name(""); - } - - if (recursive) - r->load(recursive, id); - - return r; - } - else - return 0; -} - -void BrowserPackage::package_modified() -{ - repaint(); - is_modified = TRUE; -} - -void BrowserPackage::renumber(int phase) -{ - switch (phase) { - case -1: { - BrowserNode::renumber(phase); - - QDir dir = BrowserView::get_dir(); - const QFileInfoList l = dir.entryInfoList(); - - if (!l.empty()) { - QListIterator it(l); - QFileInfo fi; - - //[lgfreitas] Qlist changed - while (it.hasNext()) { - fi = it.next(); - - if (fi.isFile() && fi.baseName().at(0).isDigit()) - dir.rename(fi.fileName(), "_" + fi.fileName()); - - //++it; - } - } - - clear(FALSE); - set_user_id(0); - } - - return; - - default: { - QDir dir = BrowserView::get_dir(); - QString old = "_" + QString::number(get_ident()); - - new_ident(phase, all); - dir.rename(old, QString::number(get_ident())); - BrowserNode::renumber(phase); - } - - return; - - case 2: { - QDir dir = BrowserView::get_dir(); - QString filter = "_*"; - const QFileInfoList l = dir.entryInfoList(filter); //[lgfreitas] QList has changed... - - if (!l.empty()) { - QListIterator it(l); - QFileInfo fi; - - // [lgfreitas] QList has changed - while (it.hasNext()) { - fi = it.next(); - QFile::remove(fi.absFilePath()); - //++it; - } - } - } - } -} +// ************************************************************************* +// +// 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 +#include +#include +#include +#include +//Added by qt3to4: +#include +#include +#include +#include +#include + +#include "BrowserPackage.h" +#include "PackageData.h" +#include "BrowserClassView.h" +#include "BrowserUseCaseView.h" +#include "BrowserClassDiagram.h" +#include "BrowserActivityDiagram.h" +#include "BrowserColDiagram.h" +#include "BrowserComponentDiagram.h" +#include "BrowserDeploymentDiagram.h" +#include "BrowserObjectDiagram.h" +#include "BrowserSeqDiagram.h" +#include "BrowserStateDiagram.h" +#include "BrowserUseCaseDiagram.h" +#include "BrowserClass.h" +#include "BrowserUseCase.h" +#include "BrowserView.h" +#include "BrowserAttribute.h" +#include "BrowserOperation.h" +#include "BrowserComponent.h" +#include "BrowserArtifact.h" +#include "BrowserDeploymentNode.h" +#include "BrowserComponentView.h" +#include "BrowserDeploymentView.h" +#include "BrowserSimpleRelation.h" +#include "BrowserState.h" +#include "BrowserPseudoState.h" +#include "BrowserStateAction.h" +#include "BrowserActivity.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 "StereotypesDialog.h" +#include "GenerationSettings.h" +#include "myio.h" +#include "ToolCom.h" +#include "Tool.h" +#include "ui/menufactory.h" +#include "UmlWindow.h" +#include "ReferenceDialog.h" +#include "UmlGlobal.h" +#include "mu.h" +#include "SaveProgress.h" +#include "DialogUtil.h" +#include "err.h" +#include "strutil.h" +#include "ProfiledStereotypes.h" +#include "translate.h" + +IdDict BrowserPackage::all(__FILE__); +Q3PtrList BrowserPackage::removed; + +QStringList BrowserPackage::its_default_stereotypes; // unicode +QStringList BrowserPackage::relation_default_stereotypes; // unicode + +BrowserPackage::BrowserPackage(QString s, BrowserView * parent, int id) + : BrowserNode(s, parent), Labeled(all, id), + def(new PackageData), associated_diagram(0), is_imported(FALSE) +{ + // creates the project package + is_modified = (id == 0); + def->set_browser_node(this); + revision = 1; + owner = -1; + + classdiagram_settings.hide_attributes = UmlNo; + classdiagram_settings.hide_operations = UmlNo; + classdiagram_settings.hide_getset_operations = UmlNo; + classdiagram_settings.show_full_members_definition = UmlNo; + classdiagram_settings.show_members_visibility = UmlNo; + classdiagram_settings.show_members_stereotype = UmlNo; + classdiagram_settings.show_members_context = noContext; + classdiagram_settings.show_members_multiplicity = UmlNo; + classdiagram_settings.show_members_initialization = UmlNo; + classdiagram_settings.show_attribute_modifiers = UmlNo; + classdiagram_settings.member_max_width = UmlUnlimitedMemberWidth; + classdiagram_settings.show_parameter_dir = UmlYes; + classdiagram_settings.show_parameter_name = UmlYes; + classdiagram_settings.package_name_in_tab = UmlNo; + classdiagram_settings.class_drawing_mode = Natural; + classdiagram_settings.drawing_language = UmlView; + classdiagram_settings.show_context_mode = noContext; + classdiagram_settings.auto_label_position = UmlYes; + classdiagram_settings.draw_all_relations = UmlYes; + classdiagram_settings.show_relation_modifiers = UmlNo; + classdiagram_settings.show_relation_visibility = UmlNo; + classdiagram_settings.show_infonote = UmlNo; + classdiagram_settings.shadow = UmlYes; + classdiagram_settings.show_stereotype_properties = UmlNo; + + class_settings.attribute_visibility = UmlPrivate; + class_settings.relation_visibility = UmlPrivate; + class_settings.operation_visibility = UmlPublic; + + usecasediagram_settings.package_name_in_tab = UmlNo; + usecasediagram_settings.show_context_mode = noContext; + usecasediagram_settings.auto_label_position = UmlYes; + usecasediagram_settings.draw_all_relations = UmlYes; + usecasediagram_settings.class_drawing_mode = asActor; + usecasediagram_settings.shadow = UmlYes; + usecasediagram_settings.show_stereotype_properties = UmlNo; + + sequencediagram_settings.show_full_operations_definition = UmlNo; + sequencediagram_settings.write_horizontally = UmlYes; + sequencediagram_settings.instances_drawing_mode = Natural; + sequencediagram_settings.drawing_language = UmlView; + sequencediagram_settings.draw_all_relations = UmlYes; + sequencediagram_settings.shadow = UmlYes; + sequencediagram_settings.show_stereotype_properties = UmlNo; + sequencediagram_settings.show_class_context_mode = noContext; + sequencediagram_settings.show_msg_context_mode = noContext; + + collaborationdiagram_settings.show_full_operations_definition = UmlNo; + collaborationdiagram_settings.show_hierarchical_rank = UmlNo; + collaborationdiagram_settings.write_horizontally = UmlYes; + collaborationdiagram_settings.drawing_language = UmlView; + collaborationdiagram_settings.package_name_in_tab = UmlNo; + collaborationdiagram_settings.show_class_pack_context_mode = noContext; + collaborationdiagram_settings.show_msg_context_mode = noContext; + collaborationdiagram_settings.draw_all_relations = UmlYes; + collaborationdiagram_settings.shadow = UmlYes; + collaborationdiagram_settings.show_stereotype_properties = UmlNo; + + objectdiagram_settings.write_horizontally = UmlYes; + objectdiagram_settings.package_name_in_tab = UmlNo; + objectdiagram_settings.show_class_pack_context_mode = noContext; + objectdiagram_settings.auto_label_position = UmlYes; + objectdiagram_settings.draw_all_relations = UmlYes; + objectdiagram_settings.shadow = UmlYes; + objectdiagram_settings.show_stereotype_properties = UmlNo; + + componentdiagram_settings.package_name_in_tab = UmlNo; + componentdiagram_settings.show_context_mode = noContext; + componentdiagram_settings.auto_label_position = UmlYes; + componentdiagram_settings.draw_all_relations = UmlYes; + componentdiagram_settings.shadow = UmlYes; + componentdiagram_settings.componentdrawingsettings.draw_component_as_icon = UmlNo; + componentdiagram_settings.componentdrawingsettings.show_component_req_prov = UmlNo; + componentdiagram_settings.componentdrawingsettings.show_component_rea = UmlNo; + componentdiagram_settings.componentdrawingsettings.show_stereotype_properties = UmlNo; + + deploymentdiagram_settings.package_name_in_tab = UmlNo; + deploymentdiagram_settings.show_context_mode = noContext; + deploymentdiagram_settings.write_horizontally = UmlYes; + deploymentdiagram_settings.auto_label_position = UmlYes; + deploymentdiagram_settings.draw_all_relations = UmlYes; + deploymentdiagram_settings.shadow = UmlYes; + deploymentdiagram_settings.componentdrawingsettings.draw_component_as_icon = UmlNo; + deploymentdiagram_settings.componentdrawingsettings.show_component_req_prov = UmlNo; + deploymentdiagram_settings.componentdrawingsettings.show_component_rea = UmlNo; + deploymentdiagram_settings.componentdrawingsettings.show_stereotype_properties = UmlNo; + + statediagram_settings.package_name_in_tab = UmlNo; + statediagram_settings.show_context_mode = noContext; + statediagram_settings.auto_label_position = UmlYes; + statediagram_settings.write_label_horizontally = UmlYes; + statediagram_settings.show_trans_definition = UmlNo; + statediagram_settings.draw_all_relations = UmlYes; + statediagram_settings.shadow = UmlYes; + statediagram_settings.statedrawingsettings.show_activities = UmlYes; + statediagram_settings.statedrawingsettings.region_horizontally = UmlYes; + statediagram_settings.statedrawingsettings.drawing_language = UmlView; + statediagram_settings.statedrawingsettings.show_stereotype_properties = UmlNo; + + activitydiagram_settings.package_name_in_tab = UmlNo; + activitydiagram_settings.show_context_mode = noContext; + activitydiagram_settings.show_opaque_action_definition = UmlNo; + activitydiagram_settings.auto_label_position = UmlYes; + activitydiagram_settings.write_label_horizontally = UmlNo; + activitydiagram_settings.draw_all_relations = UmlYes; + activitydiagram_settings.shadow = UmlYes; + activitydiagram_settings.activitydrawingsettings.show_infonote = UmlYes; + activitydiagram_settings.activitydrawingsettings.drawing_language = UmlView; + activitydiagram_settings.activitydrawingsettings.show_stereotype_properties = UmlNo; + + class_color = UmlYellow; + package_color = UmlTransparent; + fragment_color = UmlTransparent; + subject_color = UmlTransparent; + note_color = UmlBlue; + usecase_color = UmlYellow; + component_color = UmlGreen; + artifact_color = UmlGreen; + deploymentnode_color = UmlGray; + duration_color = UmlTransparent; + continuation_color = UmlGray; + state_color = UmlYellow; + stateaction_color = UmlTransparent; + activity_color = UmlTransparent; + activityregion_color = UmlTransparent; + activitypartition_color = UmlTransparent; + activityaction_color = UmlTransparent; + parameterpin_color = UmlWhite; +} + +BrowserPackage::BrowserPackage(QString s, BrowserNode * parent, int id) + : BrowserNode(s, parent), Labeled(all, id), + def(new PackageData), associated_diagram(0), is_imported(FALSE) +{ + make(); + is_modified = (id == 0); + revision = 1; + owner = -1; +} + +BrowserPackage::BrowserPackage(const BrowserPackage * model, + BrowserNode * p) + : BrowserNode(model->name, p), Labeled(all, 0) +{ + def = new PackageData(model->def); + def->set_browser_node(this); + comment = model->comment; + classdiagram_settings = model->classdiagram_settings; + class_settings = model->class_settings; + usecasediagram_settings = model->usecasediagram_settings; + sequencediagram_settings = model->sequencediagram_settings; + collaborationdiagram_settings = model->collaborationdiagram_settings; + objectdiagram_settings = model->objectdiagram_settings; + componentdiagram_settings = model->componentdiagram_settings; + deploymentdiagram_settings = model->deploymentdiagram_settings; + statediagram_settings = model->statediagram_settings; + activitydiagram_settings = model->activitydiagram_settings; + class_color = model->class_color; + package_color = model->package_color; + note_color = model->note_color; + fragment_color = model->fragment_color; + subject_color = model->subject_color; + usecase_color = model->usecase_color; + component_color = model->component_color; + artifact_color = model->artifact_color; + deploymentnode_color = model->deploymentnode_color; + duration_color = model->duration_color; + continuation_color = model->continuation_color; + state_color = model->state_color; + stateaction_color = model->stateaction_color; + activity_color = model->activity_color; + activityregion_color = model->activityregion_color; + activitypartition_color = model->activitypartition_color; + activityaction_color = model->activityaction_color; + parameterpin_color = model->parameterpin_color; + + is_modified = true; + revision = 1; + owner = -1; +} + +BrowserPackage::BrowserPackage(int id) + : Labeled(all, id), + def(new PackageData), associated_diagram(0), is_imported(FALSE) +{ + make(); + is_modified = (id == 0); + revision = 1; + owner = -1; +} + +BrowserPackage::~BrowserPackage() +{ + if (this == BrowserView::get_project()) { + // to accelerate removals + removed.clear(); + clear(FALSE); + } + else { + if (deletedp() && !modifiedp()) { + QString fn; + + fn.sprintf("%d", get_ident()); + + QDir d = BrowserView::get_dir(); + + QFile::remove(d.absFilePath(fn)); + } + + removed.remove(this); + all.remove(get_ident()); + } + + delete def; +} + +void BrowserPackage::make() +{ + def->set_browser_node(this); + + class_color = UmlDefaultColor; + note_color = UmlDefaultColor; + package_color = UmlDefaultColor; + fragment_color = UmlDefaultColor; + subject_color = UmlDefaultColor; + duration_color = UmlDefaultColor; + continuation_color = UmlDefaultColor; + usecase_color = UmlDefaultColor; + component_color = UmlDefaultColor; + artifact_color = UmlDefaultColor; + deploymentnode_color = UmlDefaultColor; + state_color = UmlDefaultColor; + stateaction_color = UmlDefaultColor; + activity_color = UmlDefaultColor; + activityregion_color = UmlDefaultColor; + activitypartition_color = UmlDefaultColor; + activityaction_color = UmlDefaultColor; + parameterpin_color = UmlDefaultColor; +} + +BrowserNode * BrowserPackage::duplicate(BrowserNode * p, QString name) +{ + BrowserPackage * result = new BrowserPackage(this, p); + + result->set_name((name.isEmpty()) ? get_name() : name); + result->update_stereotype(); + + return result; +} + +void BrowserPackage::clear(bool old) +{ + if (! old) + set_user_id(-1); + + all.clear(old); + BrowserClassView::clear(old); + BrowserUseCaseView::clear(old); + BrowserComponentView::clear(old); + BrowserDeploymentView::clear(old); + BrowserDiagram::clear(old); + + if (! old) + check_ids_cleared(); +} + +void BrowserPackage::update_idmax_for_root() +{ + all.update_idmax_for_root(); + BrowserClassView::update_idmax_for_root(); + BrowserUseCaseView::update_idmax_for_root(); + BrowserComponentView::update_idmax_for_root(); + BrowserDeploymentView::update_idmax_for_root(); + BrowserDiagram::update_idmax_for_root(); +} + +void BrowserPackage::prepare_update_lib() const +{ + all.memo_id_oid(get_ident(), original_id); + + for (Q3ListViewItem * child = firstChild(); + child != 0; + child = child->nextSibling()) + ((BrowserNode *) child)->prepare_update_lib(); +} + +void BrowserPackage::support_file(Q3Dict & files, bool add) const +{ + QString s; + + s.setNum(get_ident()); + + if (add) + files.insert(s, (char *) 1); + else + files.remove(s); + + for (Q3ListViewItem * child = firstChild(); + child != 0; + child = child->nextSibling()) + ((BrowserNode *) child)->support_file(files, add); +} + +void BrowserPackage::referenced_by(Q3PtrList & 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"); + BrowserComponentDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); + BrowserDeploymentDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); + BrowserObjectDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); + BrowserSeqDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); + BrowserStateDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); + BrowserUseCaseDiagram::compute_referenced_by(l, this, "packagecanvas", "package_ref"); + } +} + +const QPixmap * BrowserPackage::pixmap(int) const +{ + if (this == BrowserView::get_project()) + return 0; + + const char * st = def->get_stereotype(); + + if (strcmp(st, "profile") == 0) + return ((deletedp()) ? DeletedProfileIcon : ProfileIcon); + + if (deletedp()) + return DeletedPackageIcon; + + const QPixmap * px = ProfiledStereotypes::browserPixmap(st); + + return (px != 0) ? px : PackageIcon; +} + +void BrowserPackage::iconChanged() +{ + repaint(); + def->modified(); +} + +void BrowserPackage::update_stereotype(bool rec) +{ + if (def != 0) { + const char * stereotype = def->get_stereotype(); + + if (show_stereotypes && + stereotype[0] && + (strcmp(stereotype, "profile") != 0)) { + QString s = QString(QLatin1String(stereotype)); + int index = s.find(':'); + + setText(0, + "<<" + ((index == -1) ? s : s.mid(index + 1)) + + ">> " + name); + } + else + setText(0, name); + } + + if (rec) { + Q3ListViewItem * child; + + for (child = firstChild(); child != 0; child = child->nextSibling()) + ((BrowserNode *) child)->update_stereotype(TRUE); + } +} + +QString BrowserPackage::full_name(bool rev, bool) const +{ + if (!rev && !full_path.isEmpty()) + return full_path; + + if (this == BrowserView::get_project()) + return QString(); + + QString p = ((BrowserNode *) parent())->full_name(FALSE, FALSE); + + if (p.isEmpty()) + full_path = name; + else if (rev) + return name + (FullPathPrefix + p + FullPathPostfix); + else + full_path = (p + (FullPathDotDot + name)); + + return full_path; +} + +void BrowserPackage::prepare_for_sort() +{ + IdIterator it(all); + + while (it.current() != 0) { + it.current()->full_path = QString(); + ++it; + } +} + +// just check if the inheritance already exist +QString BrowserPackage::check_inherit(const BrowserNode * new_parent) const +{ + Q3ListViewItem * 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"); + } + + return (new_parent != this) ? QString() : 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); + bool isprofile = (strcmp(def->get_stereotype(), "profile") == 0); + + MenuFactory::createTitle(m, def->definition(FALSE, TRUE)); + m.insertSeparator(); + + if (!deletedp()) { + if (!is_read_only && (edition_number == 0)) { + m.setWhatsThis(m.insertItem(TR("New package"), 0), + TR("to add a new sub package")); + m.setWhatsThis(m.insertItem(TR("New use case view"), 1), + TR("to add a new use case view")); + + if (isprofile) + m.setWhatsThis(m.insertItem(TR("New class/stereotype view"), 2), + TR("to add a new class/stereotype view")); + else { + m.setWhatsThis(m.insertItem(TR("New class view"), 2), + TR("to add a new class view")); + m.setWhatsThis(m.insertItem(TR("New component view"), 3), + TR("to add a new class view")); + m.setWhatsThis(m.insertItem(TR("New deployment view"), 4), + TR("to add a new deployment view")); + } + + m.setWhatsThis(m.insertItem(TR("New profile"), 15), + TR("to add a new profile")); + m.insertSeparator(); + m.setWhatsThis(m.insertItem(TR("Import project"), 14), + TR("to import the contents of a project under \ + the current package")); + m.setWhatsThis(m.insertItem(TR("Import project as library"), 16), + TR("to import the contents of a project under \ + the current package 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 project")); + m.insertSeparator(); + } + + m.setWhatsThis(m.insertItem(TR("Edit"), 5), + TR("to edit the package")); + + if (!is_read_only) { + m.insertSeparator(); + + 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")); + } + + 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 diagrams'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")); + } + + if ((edition_number == 0) && (this != BrowserView::get_project())) { + m.insertSeparator(); + m.setWhatsThis(m.insertItem(TR("Delete"), 10), + TR("to delete the package 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 package 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 package \ + through a relation")); + mark_menu(m, TR("the package"), 90); + ProfiledStereotypes::menu(m, this, 99990); + + if (! isprofile) { + bool cpp = GenerationSettings::cpp_get_default_defs(); + bool java = GenerationSettings::java_get_default_defs(); + bool php = GenerationSettings::php_get_default_defs(); + bool python = GenerationSettings::python_get_default_defs(); + bool idl = GenerationSettings::idl_get_default_defs(); + + if (cpp || java || php || python || idl) { + m.insertSeparator(); + m.insertItem(TR("Generate"), &genm); + + if (cpp) + genm.insertItem("C++", 20); + + if (java) + genm.insertItem("Java", 21); + + if (php) + genm.insertItem("Php", 22); + + if (python) + genm.insertItem("Python", 34); + + if (idl) + genm.insertItem("Idl", 23); + } + + if (edition_number == 0) { + if (!is_read_only && (cpp || java || php || python)) { + m.insertItem(TR("Reverse"), &revm); + + if (cpp) + revm.insertItem("C++", 24); + + if (java) { + revm.insertItem("Java", 25); + revm.insertItem("Java Catalog", 26); + } + + if (php) + revm.insertItem("Php", 32); + +//#warning reverse python + + + if (java || cpp) { + m.insertItem(TR("Roundtrip"), &roundtripm); + + if (cpp) roundtripm.insertItem("C++", 38); + + if (java) roundtripm.insertItem("Java", 37); + } + + if (preserve_bodies()) { + m.insertItem(TR("Roundtrip body"), &roundtripbodym); + + if (cpp) + roundtripbodym.insertItem("C++", 30); + + if (java) + roundtripbodym.insertItem("Java", 31); + + if (php) + roundtripbodym.insertItem("Php", 33); + + if (python) + roundtripbodym.insertItem("Python", 36); + } + } + } + } + + if (Tool::menu_insert(&toolm, + (this == BrowserView::get_project()) ? UmlProject : UmlPackage, + 100)) { + m.insertSeparator(); + m.insertItem(TR("Tool"), &toolm); + } + } + else if (!is_read_only && (edition_number == 0)) { + m.setWhatsThis(m.insertItem(TR("Undelete"), 11), + TR("undelete the package. Do not undelete its sub items")); + m.setWhatsThis(m.insertItem(TR("Undelete recursively"), 12), + TR("undelete the package and its sub items")); + } + + if (user_id() == 0) { + m.insertSeparator(); + m.insertSeparator(); + m.insertSeparator(); + m.insertSeparator(); + m.insertSeparator(); + + switch (phase_renumerotation) { + case -1: + if (this == BrowserView::get_project()) + m.insertItem("PREPARE la renumerotation", 27); + + break; + + case 0: + m.insertItem("Renumerotation BASE", 27); + break; + + case 1: + m.insertItem("Renumerotation USER", 27); + break; + } + } + + exec_menu_choice(m.exec(QCursor::pos())); +} + +static bool contain_profile(BrowserPackage * p) +{ + Q3ListViewItem * child; + + for (child = p->firstChild(); child != 0; child = child->nextSibling()) { + if (!((BrowserNode *) child)->deletedp() && + (((BrowserNode *) child)->get_type() == UmlPackage)) { + if (!strcmp(((BrowserNode *) child)->get_data()->get_stereotype(), "profile")) + return TRUE; + else if (contain_profile((BrowserPackage *) child)) + 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); + break; + + case 1: { + BrowserUseCaseView * v = + BrowserUseCaseView::add_use_case_view(this); + + if (v == 0) + return; + + v->select_in_browser(); + } + break; + + case 2: { + BrowserClassView * v = + BrowserClassView::add_class_view(this); + + if (v == 0) + return; + + v->select_in_browser(); + } + break; + + case 3: + if (isprofile) + return; + + { + BrowserComponentView * v = + BrowserComponentView::add_component_view(this); + + if (v == 0) + return; + + v->select_in_browser(); + } + break; + + case 4: + if (isprofile) + return; + + { + BrowserDeploymentView * v = + BrowserDeploymentView::add_deployment_view(this); + + if (v == 0) + return; + + v->select_in_browser(); + } + break; + + case 5: + def->edit(); + return; + + case 6: + edit_stereotypes(); + return; + + case 7: + edit_class_settings(); + return; + + case 8: + edit_gen_settings(); + return; + + case 9: + edit_drawing_settings(); + return; + + case 10: + if (!strcmp(get_data()->get_stereotype(), "profile")) { + bool propag = (msg_warning(TR("Question"), + TR("Propagate the removal of the profile ?"), + 1, 2) + == 1); + ProfiledStereotypes::deleted(this, propag); + delete_it(); + } + else { + bool recomp = ProfiledStereotypes::hasStereotype() && + contain_profile(this); + + delete_it(); + + if (recomp) + ProfiledStereotypes::recompute(FALSE); + } + + ((BrowserNode *) parent())->package_modified(); + break; + + case 11: + undelete(FALSE); + ProfiledStereotypes::recompute(FALSE); + break; + + case 12: + undelete(TRUE); + ProfiledStereotypes::recompute(FALSE); + break; + + case 13: + ReferenceDialog::show(this); + return; + + case 14: + import_project(QString()); + return; + + case 15: + add_package(TRUE); + break; + + case 16: + import_project(QString(), TRUE); + break; + + case 17: + update_lib(); + return; + + case 18: + edit_rev_settings(); + return; + + case 20: + if (!isprofile) { + ToolCom::run((verbose_generation()) + ? ((preserve) ? "cpp_generator -v -p" : "cpp_generator -v") + : ((preserve) ? "cpp_generator -p" : "cpp_generator"), + this); + } + + return; + + case 21: + if (!isprofile) { + ToolCom::run((verbose_generation()) + ? ((preserve) ? "java_generator -v -p" : "java_generator -v") + : ((preserve) ? "java_generator -p" : "java_generator"), + this); + } + + return; + + case 22: + if (!isprofile) { + ToolCom::run((verbose_generation()) + ? ((preserve) ? "php_generator -v -p" : "php_generator -v") + : ((preserve) ? "php_generator -p" : "php_generator"), + this); + } + + return; + + case 34: + if (!isprofile) { + ToolCom::run((verbose_generation()) + ? ((preserve) ? "python_generator -v -p" : "python_generator -v") + : ((preserve) ? "python_generator -p" : "python_generator"), + this); + } + + return; + + case 23: + if (!isprofile) + ToolCom::run((verbose_generation()) ? "idl_generator -v" : "idl_generator", this); + + return; + + case 24: + if (!isprofile) + ToolCom::run("cpp_reverse", this); + + return; + + case 25: + if (!isprofile) + ToolCom::run("java_reverse", this); + + return; + + case 37: + if (!isprofile) + ToolCom::run("java_roundtrip", this); + + return; + + case 38: + if (!isprofile) + ToolCom::run("cpp_roundtrip", this); + + return; + + case 26: + if (!isprofile) + ToolCom::run("java_catalog", this); + + return; + + case 32: + if (!isprofile) + ToolCom::run("php_reverse", this); + + return; + + case 35: + if (!isprofile) + ToolCom::run("python_reverse", this); + + return; + + case 27: + renumber(phase_renumerotation++); + + if (phase_renumerotation == 2) { + + renumber(2); + + save_all(FALSE); + QApplication::exit(); + } + + return; + + case 28: + if (!GenerationSettings::import()) + return; + + break; + + case 29: + if (!import_stereotypes()) + return; + + break; + + case 30: + if (!isprofile) + ToolCom::run((verbose_generation()) ? "roundtrip_body -v c++" : "roundtrip_body c++", this); + + return; + + case 31: + if (!isprofile) + ToolCom::run((verbose_generation()) ? "roundtrip_body -v java" : "roundtrip_body java", this); + + return; + + case 33: + if (!isprofile) + ToolCom::run((verbose_generation()) ? "roundtrip_body -v php" : "roundtrip_body php", this); + + return; + + case 36: + if (!isprofile) + ToolCom::run((verbose_generation()) ? "roundtrip_body -v python" : "roundtrip_body python", this); + + return; + + 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); + + return; + } + + package_modified(); +} + +void BrowserPackage::apply_shortcut(QString s) +{ + int choice = -1; + + if (!deletedp()) { + if (!is_read_only && (edition_number == 0)) { + if (s == "New package") + choice = 0; + else if (s == "New use case view") + choice = 1; + else if (s == "New class view") + choice = 2; + else if (s == "New component view") + choice = 3; + else if (s == "New deployment view") + choice = 4; + } + + if (!is_edited) { + if (s == "Edit") + choice = 5; + + if (!is_read_only) { + if (this == BrowserView::get_project()) { + if (s == "Edit generation settings") + choice = 8; + else if (s == "Edit reverse/roundtrip settings") + choice = 18; + else if (s == "Edit default stereotypes") + choice = 6; + } + + if (s == "Edit class settings") + choice = 7; + else if (s == "Edit drawing settings") + choice = 9; + + if ((edition_number == 0) && (this != BrowserView::get_project())) { + if (s == "Delete") + choice = 10; + } + } + else if ((s == "Delete") && + (edition_number == 0) && + is_from_lib() && + !((BrowserPackage *) parent())->is_from_lib() && + !((BrowserPackage *) parent())->is_read_only) + choice = 10; + } + + if (s == "Referenced by") + choice = 13; + else + mark_shortcut(s, choice, 90); + + if (choice == -1) { + if (s == "Generate C++") + choice = 20; + else if (s == "Generate Java") + choice = 21; + else if (s == "Generate Php") + choice = 22; + else if (s == "Generate Python") + choice = 34; + else if (s == "Generate Idl") + choice = 23; + else if (preserve_bodies()) { + if (s == "Roundtrip C++ operation body") + choice = 30; + else if (s == "Roundtrip Java operation body") + choice = 31; + else if (s == "Roundtrip Php operation body") + choice = 32; + else if (s == "Roundtrip Python operation body") + choice = 35; + } + + if ((choice == -1) && (edition_number == 0)) + Tool::shortcut(s, choice, get_type(), 100); + } + } + else if (!is_read_only && (edition_number == 0)) { + if (s == "Undelete") + choice = 11; + else if (s == "Undelete recursively") + choice = 12; + } + + exec_menu_choice(choice); +} + +void BrowserPackage::edit_gen_settings() +{ + if (GenerationSettings::edit()) + package_modified(); +} + +void BrowserPackage::edit_rev_settings() +{ + RevSettingsDialog d; + + d.raise(); + + if (d.exec()) + package_modified(); +} + +void BrowserPackage::edit_stereotypes() +{ + StereotypesDialog d; + + d.raise(); + + if (d.exec()) + package_modified(); +} + +void BrowserPackage::edit_class_settings() +{ + if (class_settings.edit((this == BrowserView::get_project()) + ? UmlProject : UmlPackage)) + package_modified(); +} + +void BrowserPackage::edit_drawing_settings() +{ + for (;;) { + StateSpecVector st; + ColorSpecVector co(18); + + classdiagram_settings.complete(st, UmlClassView); + sequencediagram_settings.complete(st, FALSE); + collaborationdiagram_settings.complete(st, FALSE); + objectdiagram_settings.complete(st, FALSE); + usecasediagram_settings.complete(st, FALSE); + componentdiagram_settings.complete(st, FALSE); + deploymentdiagram_settings.complete(st, FALSE); + statediagram_settings.complete(st, FALSE); + activitydiagram_settings.complete(st, FALSE); + + co[0].set(TR("class color"), &class_color); + co[1].set(TR("note color"), ¬e_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"), ¶meterpin_color); + + SettingsDialog dialog(&st, &co, this == BrowserView::get_project()); + + dialog.raise(); + + if (dialog.exec() == QDialog::Accepted) { + DrawingSettings::modified(); + package_modified(); + } + + if (!dialog.redo()) + break; + } +} + + +BrowserNodeList & BrowserPackage::instances(BrowserNodeList & result) +{ + IdIterator it(all); + + while (it.current() != 0) { + if (!it.current()->deletedp()) { + it.current()->full_path = QString(); + result.append(it.current()); + } + + ++it; + } + + result.sort_it(); + + return result; +} + +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 : "), + 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 : "), + UmlPackage, TRUE, FALSE)) { + BrowserPackage * p = new BrowserPackage(name, this); + + if (profile) + p->def->set_stereotype("profile"); + + p->select_in_browser(); + + 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)"), + QMessageBox::Yes, QMessageBox::No) + == QMessageBox::Yes)) + p->owner = owner; + } +} + +BrowserPackage * BrowserPackage::import_project(QString fn, bool aslib, int id) +{ + bool manual = fn.isEmpty(); + + if (manual) { + fn = QFileDialog::getOpenFileName(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")) + 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")); + + return 0; + } + + QApplication::setOverrideCursor(Qt::waitCursor); + QDir di(fi.dirPath(TRUE)); + + BrowserPackage * p = new BrowserPackage(bname, this, id); + bool err = FALSE; + unsigned fileformat = 0; + + set_in_import(TRUE, aslib); + BrowserView::set_imported_project(di, p); + BrowserNode::pre_load(); + + PRE_TRY; + + try { + fileformat = p->load(TRUE); + } + catch (int) { + err = TRUE; + } + + POST_TRY; + + if (! err) { + if (GenerationSettings::add_class_rel_correspondences(fileformat)) + Tool::add(); + } + + BrowserNode::post_load(FALSE); + idmax_add_margin(); + BrowserDiagram::import(); + BrowserView::set_imported_project(di, 0); + set_in_import(FALSE); + clear(TRUE); + + if (err) { + p->delete_it(); + delete p; + p = 0; + } + else + 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"), + QMessageBox::Yes, QMessageBox::Cancel) + != QMessageBox::Yes) + return; + + UmlWindow::save_it(); + } + + Q3Dict files; + + support_file(files, TRUE); + + Q3DictIterator it(files); + QDir d = BrowserView::get_dir(); + + while (it.current()) { + QFileInfo fi(d, it.currentKey()); + + if (!fi.exists()) + files.remove(it.currentKey()); // update it + else if (!fi.isWritable()) { + msg_critical(TR("Error"), TR("file '%1' is read only, update aborted", it.currentKey())); + files.clear(); + return; + } + else + ++it; + } + + QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), name + ".prj"); + + if (fn.isEmpty()) + return; + + QFileInfo fi(fn); + + if (my_baseName(fi) != name) { + msg_critical(TR("Error"), TR("you didn't select project '%1'", name)); + return; + } + + BrowserPackage * container = (BrowserPackage *) parent(); + Q3ListViewItem * previous = 0; + Q3ListViewItem * child = container->firstChild(); + + while (this != child) { + previous = child; + child = child->nextSibling(); + } + + prepare_update_lib(); + container->takeItem(this); + + BrowserPackage * updated = container->import_project(fn, TRUE, get_ident()); + + updated->original_id = original_id; + updated->support_file(files, FALSE); + it.toFirst(); + + for (; it.current(); ++it) + QFile::remove(d.absFilePath(it.currentKey())); + + if (previous != 0) + updated->moveItem(previous); + else + container->insertItem(updated); + + updated->select_in_browser(); + + UmlWindow::save_it(); + container->insertItem(this); + UmlWindow::reload_it(); +} + +UmlCode BrowserPackage::get_type() const +{ + return UmlPackage; +} + +QString BrowserPackage::get_stype() const +{ + return TR("package"); +} + +int BrowserPackage::get_identifier() const +{ + return get_ident(); +} + +const char * BrowserPackage::help_topic() const +{ + return (!strcmp(def->get_stereotype(), "profile")) + ? "profile" + : "package"; +} + +BasicData * BrowserPackage::get_data() const +{ + return def; +} + +void BrowserPackage::get_classdiagramsettings(ClassDiagramSettings & r) const +{ + if (! classdiagram_settings.complete(r)) + ((BrowserNode *) parent())->get_classdiagramsettings(r); +} + +void BrowserPackage::get_sequencediagramsettings(SequenceDiagramSettings & r) const +{ + if (! sequencediagram_settings.complete(r)) + ((BrowserNode *) parent())->get_sequencediagramsettings(r); +} + +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) { + case UmlClass: + c = class_color; + break; + + case UmlNote: + c = note_color; + break; + + case UmlFragment: + c = fragment_color; + break; + + case UmlSubject: + c = subject_color; + break; + + case UmlUseCase: + c = usecase_color; + break; + + case UmlComponent: + c = component_color; + break; + + case UmlArtifact: + c = artifact_color; + break; + + case UmlDeploymentNode: + c = deploymentnode_color; + break; + + case UmlContinuation: + c = continuation_color; + break; + + case UmlActivityDuration: + c = duration_color; + break; + + case UmlState: + c = state_color; + break; + + case UmlStateAction: + c = stateaction_color; + break; + + case UmlActivity: + c = activity_color; + break; + + case UmlInterruptibleActivityRegion: + case UmlExpansionRegion: + c = activityregion_color; + break; + + case UmlActivityPartition: + c = activitypartition_color; + break; + + case UmlActivityAction: + c = activityaction_color; + break; + + case UmlExpansionNode: + case UmlParameter: + case UmlActivityPin: + c = parameterpin_color; + break; + + default: // UmlPackage: + c = package_color; + break; + } + + return (c != UmlDefaultColor) + ? c + : ((BrowserNode *) parent())->get_color(who); +} + +UmlVisibility BrowserPackage::get_visibility(UmlCode who) const +{ + UmlVisibility v; + + switch (who) { + case UmlAttribute: + v = class_settings.attribute_visibility; + break; + + case UmlRelations: + v = class_settings.relation_visibility; + break; + + default: // UmlOperation + v = class_settings.operation_visibility; + break; + } + + return (v != UmlDefaultVisibility) + ? v + : ((BrowserNode *) parent())->get_visibility(who); +} + +void BrowserPackage::open(bool force_edit) +{ + if (!force_edit && + (associated_diagram != 0) && + !associated_diagram->deletedp()) + associated_diagram->open(FALSE); + else if (!is_edited) + def->edit(); +} + +void BrowserPackage::on_close() +{ +} + +BrowserNode * BrowserPackage::get_associated() const +{ + return associated_diagram; +} + +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()), + def, SLOT(on_delete())); + + if ((associated_diagram = dg) != 0) + QObject::connect(associated_diagram->get_data(), SIGNAL(deleted()), + def, SLOT(on_delete())); + + if (! on_read) + package_modified(); + } +} + +void BrowserPackage::on_delete() +{ + if (associated_diagram && associated_diagram->deletedp()) + associated_diagram = 0; +} + +void BrowserPackage::write_id(ToolCom * com) +{ + // to manage project case as any package + com->write_id(this, UmlPackage - UmlRelations, name); +} + +// connexion by a flow or a dependency +QString BrowserPackage::may_connect(UmlCode & l, const BrowserNode * dest) const +{ + switch (dest->get_type()) { + case UmlPackage: + switch (l) { + case UmlDependency: + l = UmlDependOn; + + //no break; + case UmlDependOn: + return 0; + + case UmlGeneralisation: + l = UmlInherit; + + // no break; + case UmlInherit: + return check_inherit(dest); + + default: + return TR("illegal"); + } + + case UmlActivity: + case UmlActivityAction: + case UmlActivityObject: + case UmlComponent: + case UmlArtifact: + case UmlClass: + switch (l) { + case UmlDependency: + l = UmlDependOn; + + //no break; + case UmlDependOn: + return 0; + + default: + return TR("illegal"); + } + + default: + return TR("illegal"); + } +} + +bool BrowserPackage::tool_cmd(ToolCom * com, const char * args) +{ + switch ((unsigned char) args[-1]) { + case supportFileCmd: { + QString fn; + + if (this == BrowserView::get_project()) + fn = name +"s.prj" ; + else + fn.setNum(get_ident()); + + QDir d = BrowserView::get_dir(); + + com->write_string(d.absFilePath(fn)); + } + + return TRUE; + + case createCmd: { + bool ok = TRUE; + + if (is_read_only && !root_permission()) + ok = FALSE; + else { + switch (com->get_kind(args)) { + case UmlPackage: + if (wrong_child_name(args, UmlPackage, TRUE, FALSE)) + ok = FALSE; + else + (new BrowserPackage(args, this))->write_id(com); + + break; + + case UmlSimpleRelations: { + UmlCode c; + + if (!com->get_relation_kind(c, args)) + ok = FALSE; + else { + BrowserNode * end = (BrowserNode *) com->get_id(args); + + if (may_connect(c, end).isEmpty()) + add_relation(c, end)->get_browser_node()->write_id(com); + else + ok = FALSE; + } + } + break; + + case UmlUseCaseView: + if (wrong_child_name(args, UmlUseCaseView, TRUE, FALSE)) + ok = FALSE; + else + (new BrowserUseCaseView(args, this))->write_id(com); + + break; + + case UmlClassView: + if (wrong_child_name(args, UmlClassView, TRUE, FALSE)) + ok = FALSE; + else + (new BrowserClassView(args, this))->write_id(com); + + break; + + case UmlComponentView: + if (wrong_child_name(args, UmlComponentView, TRUE, FALSE)) + ok = FALSE; + else + (new BrowserComponentView(args, this))->write_id(com); + + break; + + case UmlDeploymentView: + if (wrong_child_name(args, UmlDeploymentView, TRUE, FALSE)) + ok = FALSE; + else + (new BrowserDeploymentView(args, this))->write_id(com); + + break; + + default: + ok = FALSE; + } + } + + if (! ok) + com->write_id(0); + else + package_modified(); + + return TRUE; + } + break; + + case setAssocDiagramCmd: + if (is_read_only && !root_permission()) + com->write_ack(FALSE); + else { + set_associated_diagram((BrowserClassDiagram *) com->get_id(args)); + com->write_ack(TRUE); + } + + return TRUE; + + case importProjectCmd: + if (is_read_only && !root_permission()) + com->write_id(0); + else { + BrowserPackage * p = import_project(args, FALSE); + + if (p == 0) + com->write_id(0); + else + p->write_id(com); + } + + return TRUE; + + case old_deleteCmd: + case deleteCmd: + if ((is_read_only && !root_permission()) || + (parent() == 0) || + (((BrowserPackage *) parent())->is_read_only && !root_permission())) + com->write_ack(FALSE); + else { + delete_it(); + ((BrowserNode *) parent())->get_data()->modified(); + package_modified(); + ((BrowserNode *) parent())->package_modified(); + com->write_ack(TRUE); + } + + return TRUE; + + default: + return (def->tool_cmd(com, args, this, comment) || + BrowserNode::tool_cmd(com, args)); + } +} + +bool BrowserPackage::tool_global_cmd(ToolCom * com, const char * args) +{ + const WrapperStr & (PackageData::* pf)() const; + + switch ((unsigned char) args[-1]) { + case findCppNamespaceCmd: + pf = &PackageData::get_cpp_namespace; + break; + + case findJavaPackageCmd: + pf = &PackageData::get_java_package; + break; + + case findPhpNamespaceCmd: + pf = &PackageData::get_php_namespace; + break; + + case findIdlModuleCmd: + pf = &PackageData::get_idl_module; + break; + + case findPythonPackageCmd: + pf = &PackageData::get_python_package; + break; + + case getProjectCmd: + BrowserView::get_project()->write_id(com); + return TRUE; + + case isProjectModifiedCmd: + com->write_char(must_be_saved() != FALSE); + return TRUE; + + case saveProjectCmd: + UmlWindow::save_it(); + return TRUE; + + case updateProfileCmd: + ProfiledStereotypes::recompute(FALSE); + return TRUE; + + case findStereotypeCmd: { + bool case_sensitive; + + switch (*args) { + case 'y': + case_sensitive = TRUE; + args += 2; + break; + + case 'n': + case_sensitive = FALSE; + args += 2; + break; + + default: + // first pseudo definition for 4.2.1 + case_sensitive = (com->get_id(args) != 0); + } + + BrowserClass * r = ProfiledStereotypes::isModeled(args, case_sensitive); + + if (r == 0) + com->write_id(0); + else + r->write_id(com); + } + + return TRUE; + + default: + return FALSE; + } + + // search for a package/namespace/module + BrowserPackage * p = (BrowserPackage *) com->get_id(args); + + if (p == 0) + // old version + p = BrowserView::get_project(); + + if ((p = p->find_it(args, pf)) != 0) + p->write_id(com); + else + com->write_id(0); + + return TRUE; +} + +BrowserPackage * +BrowserPackage::find_it(const char * s, + const WrapperStr & (PackageData::* pf)() const) +{ + if (!deletedp()) { + if ((def->*pf)() == s) { + // find ! + return this; + } + else { + for (Q3ListViewItem * child = firstChild(); + child != 0; + child = child->nextSibling()) { + if (((BrowserNode *) child)->get_type() == UmlPackage) { + BrowserPackage * p = + ((BrowserPackage *) child)->find_it(s, pf); + + if (p != 0) + return p; + } + } + } + } + + return 0; +} + + +void BrowserPackage::DragMoveEvent(QDragMoveEvent * e) +{ + bool rel = UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)); + + if (rel || + UmlDrag::canDecode(e, UmlPackage) || + UmlDrag::canDecode(e, UmlUseCaseView) || + UmlDrag::canDecode(e, UmlClassView) || + UmlDrag::canDecode(e, UmlComponentView) || + UmlDrag::canDecode(e, UmlDeploymentView)) { + if (!is_read_only || + (!rel && (parent() != 0) && !((BrowserPackage *) parent())->is_read_only)) + e->accept(); + else + e->ignore(); + } + else if (parent() != 0) + ((BrowserNode *) parent())->DragMoveInsideEvent(e); + else + e->ignore(); +} + +void BrowserPackage::DragMoveInsideEvent(QDragMoveEvent * e) +{ + if (!is_read_only && + (UmlDrag::canDecode(e, UmlPackage) || + UmlDrag::canDecode(e, UmlUseCaseView) || + UmlDrag::canDecode(e, UmlClassView) || + UmlDrag::canDecode(e, UmlComponentView) || + UmlDrag::canDecode(e, UmlDeploymentView) || + UmlDrag::canDecode(e, BrowserSimpleRelation::drag_key(this)))) + e->accept(); + else + e->ignore(); +} + +bool BrowserPackage::may_contains_them(const Q3PtrList & l, + BooL & duplicable) const +{ + Q3PtrListIterator it(l); + + for (; it.current(); ++it) { + switch (it.current()->get_type()) { + case UmlPackage: + case UmlUseCaseView: + case UmlClassView: + case UmlComponentView: + case UmlDeploymentView: + break; + + default: + if (!IsaSimpleRelation(it.current()->get_type()) || + (((const BrowserNode *) it.current()->parent()) != this)) + return FALSE; + } + + duplicable = FALSE; + + if (! may_contains(it.current(), FALSE)) + return FALSE; + } + + return TRUE; +} + +void BrowserPackage::DropEvent(QDropEvent * e) +{ + DropAfterEvent(e, 0); +} + +void BrowserPackage::DropAfterEvent(QDropEvent * e, BrowserNode * after) +{ + BrowserNode * bn = UmlDrag::decode(e, BrowserSimpleRelation::drag_key(this)); + bool rel = (bn != 0); + + if ((rel || + ((bn = UmlDrag::decode(e, UmlPackage)) != 0) || + ((bn = UmlDrag::decode(e, UmlUseCaseView)) != 0) || + ((bn = UmlDrag::decode(e, UmlClassView)) != 0) || + ((bn = UmlDrag::decode(e, UmlComponentView)) != 0) || + ((bn = UmlDrag::decode(e, UmlDeploymentView)) != 0)) && + (bn != after) && (bn != this)) { + UmlCode what = bn->get_type(); + + if (may_contains(bn, what == UmlPackage)) { + BrowserNode * x = this; + + if ((after == 0) && + !rel && + (parent() != 0) && + ((BrowserNode *) parent())->may_contains(bn, what == UmlPackage)) { + // have choice + Q3PopupMenu m(0); + + MenuFactory::createTitle(m, TR("move ") + bn->get_name()); + m.insertSeparator(); + + if (!is_read_only) + 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; + } + } + + BrowserNode * old_parent = (BrowserNode *) bn->parent(); + bool stereotype_moved = FALSE; + + if ((what == UmlClassView) && + (x != old_parent) && + !strcmp(old_parent->get_data()->get_stereotype(), "profile")) + stereotype_moved = ((BrowserClassView *) bn)->extract_from_profile(); + + if (after) + bn->moveItem(after); + else { + old_parent->takeItem(bn); + x->insertItem(bn); + } + + if (old_parent != x) { + if (stereotype_moved && + (what == UmlClassView) && + !strcmp(x->get_data()->get_stereotype(), "profile")) + ((BrowserClassView *) bn)->insert_in_profile(); + + old_parent->package_modified(); + bn->modified(); + } + + x->package_modified(); + } + else if ((parent() != 0) && (after == 0)) + ((BrowserNode *) parent())->DropAfterEvent(e, this); + else { + msg_critical(TR("Error"), TR("Forbidden")); + e->ignore(); + } + } + else if ((bn == 0) && (after == 0)) + ((BrowserNode *) parent())->DropAfterEvent(e, this); + else + e->ignore(); +} + +// stereotypes (unicode) + +const QStringList & BrowserPackage::default_stereotypes() +{ + return its_default_stereotypes; +} + +const QStringList & BrowserPackage::default_stereotypes(UmlCode, const BrowserNode *) const +{ + return relation_default_stereotypes; +} + +void BrowserPackage::init() +{ + its_default_stereotypes.clear(); + its_default_stereotypes.append("facade"); + its_default_stereotypes.append("framework"); + its_default_stereotypes.append("model library"); + its_default_stereotypes.append("stub"); + its_default_stereotypes.append("toplevel"); + its_default_stereotypes.append("profile"); + + relation_default_stereotypes.clear(); + relation_default_stereotypes.append("access"); + relation_default_stereotypes.append("import"); + relation_default_stereotypes.append("from"); +} + +void BrowserPackage::save_stereotypes() +{ + QSharedPointer newdef(new QByteArray()); + QTextStream st(newdef.data(), QIODevice::WriteOnly); + // QLOG_INFO() << newdef->data(); + st.setEncoding(QTextStream::Latin1); + // QLOG_INFO() << newdef->data(); + nl_indent(st); + st << "package_stereotypes "; + st.flush(); + QLOG_INFO() << newdef->data(); + save_unicode_string_list(its_default_stereotypes, st); + nl_indent(st); + st << " " << stringify(UmlDependency); + save_unicode_string_list(relation_default_stereotypes, st); + nl_indent(st); + st << "end"; + nl_indent(st); + + BrowserClass::save_stereotypes(st); + BrowserUseCase::save_stereotypes(st); + BrowserArtifact::save_stereotypes(st); + BrowserAttribute::save_stereotypes(st); + BrowserOperation::save_stereotypes(st); + BrowserState::save_stereotypes(st); + BrowserActivity::save_stereotypes(st); + BrowserFlow::save_stereotypes(st); + BrowserInterruptibleActivityRegion::save_stereotypes(st); + BrowserPseudoState::save_stereotypes(st); + BrowserStateAction::save_stereotypes(st); + BrowserParameter::save_stereotypes(st); + BrowserParameterSet::save_stereotypes(st); + BrowserActivityNode::save_stereotypes(st); + BrowserActivityAction::save_stereotypes(st); + BrowserActivityObject::save_stereotypes(st); + BrowserExpansionRegion::save_stereotypes(st); + BrowserActivityPartition::save_stereotypes(st); + BrowserPin::save_stereotypes(st); + BrowserComponent::save_stereotypes(st); + BrowserDeploymentNode::save_stereotypes(st); + BrowserClassView::save_stereotypes(st); + BrowserUseCaseView::save_stereotypes(st); + BrowserComponentView::save_stereotypes(st); + BrowserDeploymentView::save_stereotypes(st); + BrowserDiagram::save_stereotypes(st); + st << "\nend\n"; + + st << '\000'; + st.flush(); + QLOG_INFO() << newdef->data(); + save_if_needed("stereotypes", newdef); +} + +void BrowserPackage::read_stereotypes(char *& st, char *& k) +{ + if (!strcmp(k, "package_stereotypes")) { + read_unicode_string_list(its_default_stereotypes, st); + read_keyword(st, stringify(UmlDependency)); + read_unicode_string_list(relation_default_stereotypes, st); + read_keyword(st, "end"); + k = read_keyword(st); + + // force profile + if (its_default_stereotypes.findIndex("profile") == -1) + its_default_stereotypes.append("profile"); + } + else + init(); +} + +bool BrowserPackage::read_stereotypes(const char * f) +{ + char * s = read_file((f == 0) ? "stereotypes" : f); + + if (s != 0) { + PRE_TRY; + + try { + char * st = s; + char * k = read_keyword(st); + + 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 + BrowserOperation::read_stereotypes(st, k); // updates k + BrowserState::read_stereotypes(st, k); // updates k + BrowserActivity::read_stereotypes(st, k); // updates k + BrowserFlow::read_stereotypes(st, k); // updates k + BrowserInterruptibleActivityRegion::read_stereotypes(st, k); // updates k + BrowserPseudoState::read_stereotypes(st, k); // updates k + BrowserStateAction::read_stereotypes(st, k); // updates k + BrowserParameter::read_stereotypes(st, k); // updates k + BrowserParameterSet::read_stereotypes(st, k); // updates k + BrowserActivityNode::read_stereotypes(st, k); // updates k + BrowserActivityAction::read_stereotypes(st, k); // updates k + BrowserActivityObject::read_stereotypes(st, k); // updates k + BrowserExpansionRegion::read_stereotypes(st, k); // updates k + BrowserActivityPartition::read_stereotypes(st, k);// updates k + BrowserPin::read_stereotypes(st, k); // updates k + BrowserComponent::read_stereotypes(st, k); // updates k + BrowserDeploymentNode::read_stereotypes(st, k); // updates k + BrowserClassView::read_stereotypes(st, k); // updates k + BrowserUseCaseView::read_stereotypes(st, k); // updates k + BrowserComponentView::read_stereotypes(st, k); // updates k + BrowserDeploymentView::read_stereotypes(st, k); // updates k + BrowserDiagram::read_stereotypes(st, k); // updates k + } + catch (int) { + ; + } + + POST_TRY; + delete [] s; + return TRUE; + } + + return FALSE; +} + +bool BrowserPackage::import_stereotypes() +{ + QString fn = Q3FileDialog::getOpenFileName(last_used_directory(), "stereotypes"); + + if (fn.isEmpty()) + return FALSE; + + set_last_used_directory(fn); + return read_stereotypes((const char *) fn); +} + +// save / restore + +void BrowserPackage::save(QTextStream & st, bool, QString &) +{ + // saves just its reference for its father + nl_indent(st); + st << "package_ref " << get_ident() << " // " << get_name(); +} + +// saves all (modified) packages + +void BrowserPackage::init_save_counter() +{ + // does nothing +} + +void BrowserPackage::save_all(bool modified_only) +{ + IdIterator itcpt(all); + + must_be_saved_counter = 0; + already_saved = 0; + + while (itcpt.current()) { + BrowserPackage * pack = itcpt.current(); + + if (!pack->deletedp() && + (!modified_only || + (pack->is_modified && + (pack->is_imported || !pack->is_read_only)))) + pack->BrowserNode::init_save_counter(); + + ++itcpt; + } + + if (must_be_saved_counter == 0) + return; + + save_progress = new SaveProgress(must_be_saved_counter); + + IdIterator it(all); + QDir d = BrowserView::get_dir(); + QString warning; + + while (it.current()) { + BrowserPackage * pack = it.current(); + bool prj = (pack == BrowserView::get_project()); + QString fn; + + if (prj) + fn = ((const char *) pack->name) + QString(".prj"); + else + fn.setNum(it.currentKey()); + + if (pack->deletedp()) { + pack->is_modified = FALSE; + backup(d, fn); + } + else if (!modified_only || + (pack->is_modified && + (pack->is_imported || !pack->is_read_only))) { + backup(d, fn); + + for (;;) { + QFile fp(d.absFilePath(fn)); + + while (!fp.open(QIODevice::WriteOnly)) + (void) msg_critical(TR("Error"), TR("Cannot create file\n") + fn, + QMessageBox::Retry); + + if (prj) + UmlWindow::historic_add(fp.name()); + + QTextStream st(&fp); + + st.setEncoding(QTextStream::Latin1); + + // saves the package own data + + indent0(); + st << "format " << api_format() << "\n"; + + save_string(pack->name, st); + + if (!prj) + st << " // " << (const char *) pack->full_name(); + + indent(+1); + + nl_indent(st); + st << "revision " << pack->revision; + nl_indent(st); + st << "modified_by " << user_id() + << " \"" << (const char *) user_name() << '"'; + + if (pack->owner != -1) { + // owner specified, the save is done => owner is current user ! + nl_indent(st); + st << "owner " << pack->owner << " "; + + if (pack->owner > 1) + save_string(user_name(), st); + } + + if (prj) { + GenerationSettings::save_dirs(st); + GenerationSettings::save_descriptions(st); + nl_indent(st); + save_stereotypes(); + GenerationSettings::save(); + Tool::save(); + } + + nl_indent(st); + st << "// class settings"; + pack->class_settings.save(st); + nl_indent(st); + st << "//class diagram settings"; + pack->classdiagram_settings.save(st); + nl_indent(st); + st << "//use case diagram settings"; + pack->usecasediagram_settings.save(st); + nl_indent(st); + st << "//sequence diagram settings"; + pack->sequencediagram_settings.save(st); + nl_indent(st); + st << "//collaboration diagram settings"; + pack->collaborationdiagram_settings.save(st); + nl_indent(st); + st << "//object diagram settings"; + pack->objectdiagram_settings.save(st); + nl_indent(st); + st << "//component diagram settings"; + pack->componentdiagram_settings.save(st); + nl_indent(st); + st << "//deployment diagram settings"; + pack->deploymentdiagram_settings.save(st); + nl_indent(st); + st << "//state diagram settings"; + pack->statediagram_settings.save(st); + nl_indent(st); + st << "//activity diagram settings"; + pack->activitydiagram_settings.save(st); + nl_indent(st); + + BooL nl = FALSE; + + save_color(st, "class_color", pack->class_color, nl); + save_color(st, "duration_color", pack->duration_color, nl); + save_color(st, "continuation_color", pack->continuation_color, nl); + save_color(st, "note_color", pack->note_color, nl); + save_color(st, "fragment_color", pack->fragment_color, nl); + save_color(st, "subject_color", pack->subject_color, nl); + save_color(st, "usecase_color", pack->usecase_color, nl); + save_color(st, "package_color", pack->package_color, nl); + save_color(st, "component_color", pack->component_color, nl); + save_color(st, "artifact_color", pack->component_color, nl); + save_color(st, "deploymentnode_color", pack->deploymentnode_color, nl); + save_color(st, "state_color", pack->state_color, nl); + save_color(st, "stateaction_color", pack->stateaction_color, nl); + save_color(st, "activity_color", pack->activity_color, nl); + save_color(st, "activityregion_color", pack->activityregion_color, nl); + save_color(st, "activitypartition_color", pack->activitypartition_color, nl); + save_color(st, "activityaction_color", pack->activityaction_color, nl); + save_color(st, "parameterpin_color", pack->parameterpin_color, nl); + + if (prj) { + nl_indent(st); + st << "font_size " << NormalFont.pointSize(); + nl_indent(st); + st << "diagram_format " + << stringify(UmlWindow::default_format()) << '\n'; + nl_indent(st); + st << "image_root_dir "; + save_string(fromUnicode(UmlWindow::images_root_dir()), st); + st << '\n'; + nl_indent(st); + st << "mark_for_import"; + nl_indent(st); + } + + pack->def->save(st, warning); + + if (pack->associated_diagram != 0) { + nl_indent(st); + st << "associated_diagram "; + pack->associated_diagram->save(st, TRUE, warning); + } + + pack->BrowserNode::save(st); + + // saves the package's sub elts + + Q3ListViewItem * child = pack->firstChild(); + + if (child != 0) { + for (;;) { + if (!((BrowserNode *) child)->deletedp()) { + ((BrowserNode *) child)->save(st, FALSE, warning); + child = child->nextSibling(); + + if (child != 0) + st << '\n'; + else + break; + } + else if ((child = child->nextSibling()) == 0) + break; + } + } + + if (prj) { + if (preserve_bodies()) + st << "\npreserve_bodies\n"; + else if (add_operation_profile()) + st << "\nadd_operation_profile\n"; + } + + st << "\nend\n"; + st.flush(); + + fp.close(); + + if (static_cast(fp.status()) == IO_Ok) { + pack->is_imported = pack->is_modified = FALSE; + + // for saveAs + if (!modified_only && !pack->is_from_lib() && !pack->is_api_base()) + pack->is_read_only = FALSE; + + // all done + break; + } + + (void) msg_critical(TR("Error"), + TR("Error while writting in\n%1\nmay be your disk is full", fn), + QMessageBox::Retry); + } + } + + ++it; + } + + if (save_progress != 0) + delete save_progress; + + if (!warning.isEmpty()) + warn(warning); + + delete_backup(d); +} + +bool BrowserPackage::must_be_saved() +{ + IdIterator it(all); + + while (it.current()) { + if (it.current()->is_modified && + !it.current()->deletedp() && + !it.current()->is_read_only) + return TRUE; + + ++it; + } + + return FALSE; +} + +void BrowserPackage::save_session(QTextStream & st) +{ + if (show_stereotypes) + st << "show_stereotypes\n"; + + QString warning; + + if (! marked_list.isEmpty()) { + Q3PtrListIterator it(marked_list); + + st << "marked\n"; + + for (; it.current() != 0; ++it) { + st << " "; + it.current()->save(st, TRUE, warning); + st << '\n'; + } + + st << "end\n"; + } + + BrowserNode * sel = (BrowserNode *) listView()->currentItem(); + + if ((sel != 0) && !sel->deletedp()) { + st << "selected "; + sel->save(st, TRUE, warning); + st << '\n'; + } + + if (isOpen()) { + Q3ListViewItem * child; + + st << "open\n"; + + for (child = firstChild(); child != 0; child = child->nextSibling()) { + BrowserNode * ch = ((BrowserNode *) child); + + if (!ch->deletedp()) + ch->save_open_list(st); + } + + st << "end\n"; + } + + if (!completion()) + st << "nocompletion\n"; + + st << "end\n"; +} + +static void open_it(Q3ListViewItem * bn) +{ + if (bn && !bn->isOpen()) { + open_it(bn->parent()); + bn->setOpen(TRUE); + } +} + +void BrowserPackage::read_session(char *& st, const char * k) +{ + if (!strcmp(k, "diagrams")) { + BrowserDiagram * active_one = 0; + + while (strcmp(k = read_keyword(st), "end")) { + bool active; + + if (!strcmp(k, "active")) { + active = TRUE; + k = read_keyword(st); + } + else + active = FALSE; + + BrowserDiagram * bn = (BrowserDiagram *) get_it(k, read_id(st)); + + if (bn != 0) { + ReadContext context = current_context(); + + bn->open(FALSE); + restore_context(context); + bn->read_session(st); + + if (active) + active_one = bn; + } + } + + if (active_one != 0) + active_one->open(FALSE); + + k = read_keyword(st); + } + + if (!strcmp(k, "show_stereotypes")) { + if (!show_stereotypes) + toggle_show_stereotypes(); + + k = read_keyword(st); + } + else if (show_stereotypes) + toggle_show_stereotypes(); + + if (!strcmp(k, "marked")) { + while (strcmp(k = read_keyword(st), "end")) { + BrowserNode * bn = get_it(k, read_id(st)); + + if (bn != 0) + bn->toggle_mark(); + } + + k = read_keyword(st); + } + + BrowserNode * sel; + + if (! strcmp(k, "selected")) { + k = read_keyword(st); + + sel = get_it(k, read_id(st)); + + k = read_keyword(st); + } + else + sel = 0; + + if (! strcmp(k, "open")) { + while (strcmp(k = read_keyword(st), "end")) + open_it(get_it(k, read_id(st))); + + k = read_keyword(st); + } + + if (! strcmp(k, "nocompletion")) { + set_completion(FALSE); + k = read_keyword(st); + } + else + set_completion(TRUE); + + if (sel != 0) { + listView()->setSelected(sel, TRUE); + listView()->ensureItemVisible(sel); + } + + // don't check old 'scroll n> ' or new 'end' +} + +BrowserNode * BrowserPackage::get_it(const char * k, int id) +{ + if (!strcmp(k, "package_ref")) + return all[id]; + + BrowserNode * r; + + 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 = 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; + 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); + 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; + + ReadContext context = current_context(); + + if ((sz = open_file(fp, QIODevice::ReadOnly)) != -1) { + char * s = new char[sz + 1]; + int offset = 0; + int 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")); + delete [] s; + THROW_ERROR 0; + } + + offset += nread; + } + while (offset != sz); + + s[sz] = 0; + + bool err = FALSE; + + PRE_TRY; + + try { + char * st = s; + char * k; + + read_keyword(st, "format"); + set_read_file_format(read_unsigned(st)); + + if (read_file_format() > api_format(true)) { + msg_critical("Error", + TR("Your version of DOUML is too old to read this project")); + throw 0; + } + + if (in_import() && prj) + { + result = read_file_format(); + + if (read_file_format() <= 21) { + msg_critical(TR("Error"), + TR( + "Sorry, the imported project has a too old format.\n" + "To change its format : load this project and save it.")); + throw 0; + } + + k = skip_until(st, "mark_for_import"); + } + else + { + set_name(read_string(st)); + + k = read_keyword(st); + + if (!strcmp(k, "revision")) { + revision = read_unsigned(st) + 1; + k = read_keyword(st); + + if (!strcmp(k, "modified_by")) { + read_keyword(st); + read_string(st); + k = read_keyword(st); + } + + if (! strcmp(k, "owner")) { + owner = read_unsigned(st); + + if (owner != user_id()) { + is_read_only = TRUE; + set_read_only_file(); + } + + if (owner > 1) + read_string(st); // owner's name + + k = read_keyword(st); + } + } + + if (prj) { + result = read_file_format(); + GenerationSettings::read_dirs(st, k); // updates k + GenerationSettings::read_descriptions(st, k); // updates k + + if (read_file_format() <= 6) + GenerationSettings::read(st, k); // updates k + + 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 + BrowserOperation::read_stereotypes(st, k); // updates k + BrowserComponent::read_stereotypes(st, k); // updates k + BrowserDeploymentNode::read_stereotypes(st, k); // updates k + BrowserClassView::read_stereotypes(st, k); // updates k + BrowserUseCaseView::read_stereotypes(st, k);// updates k + BrowserComponentView::read_stereotypes(st, k); // updates k + BrowserDeploymentView::read_stereotypes(st, k); // updates k + BrowserDiagram::read_stereotypes(st, k); // updates k + 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 + + if (read_file_format() >= 21) + statediagram_settings.read(st, k); // updates k + + 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) + classdiagram_settings.auto_label_position = UmlYes; + + if (usecasediagram_settings.auto_label_position == UmlDefaultState) + usecasediagram_settings.auto_label_position = UmlYes; + + if (componentdiagram_settings.auto_label_position == UmlDefaultState) + componentdiagram_settings.auto_label_position = UmlYes; + + if (deploymentdiagram_settings.auto_label_position == UmlDefaultState) + deploymentdiagram_settings.auto_label_position = UmlYes; + } + + read_color(st, "class_color", class_color, k); // updates k + read_color(st, "duration", duration_color, k); // old, updates k + read_color(st, "duration_color", duration_color, k); // updates k + read_color(st, "continuation_color", continuation_color, k); // updates k + read_color(st, "note_color", note_color, k); // updates k + read_color(st, "fragment_color", fragment_color, k); // updates k + read_color(st, "subject_color", subject_color, k); // updates k + read_color(st, "usecase_color", usecase_color, k); // updates k + read_color(st, "package_color", package_color, k); // updates k + read_color(st, "component_color", component_color, k); // updates k + read_color(st, "artifact_color", artifact_color, k); // updates k + read_color(st, "deploymentnode_color", deploymentnode_color, k); // updates k + read_color(st, "state_color", state_color, k); // updates k + read_color(st, "stateaction_color", stateaction_color, k); // updates k + read_color(st, "activity_color", activity_color, k); // updates k + read_color(st, "activityregion_color", activityregion_color, k); // updates k + read_color(st, "activitypartition_color", activitypartition_color, k); // updates k + read_color(st, "activityaction_color", activityaction_color, k); // updates k + read_color(st, "parameterpin_color", parameterpin_color, k); // updates k + } + + if (read_file_format() > 9) + { + if (prj) + { + if (!strcmp(k, "font_size")) { + resize_font((int) read_unsigned(st)); + k = read_keyword(st); + } + else + init_font(); + + if (!strcmp(k, "diagram_format")) { + UmlWindow::set_default_format(canvas_format(read_keyword(st))); + k = read_keyword(st); + } + else + UmlWindow::set_default_format(IsoA4); + + if (!strcmp(k, "image_root_dir")) { + UmlWindow::set_images_root_dir(toUnicode(read_string(st))); + k = read_keyword(st); + } + else + UmlWindow::set_images_root_dir(""); + + if (strcmp(k, "mark_for_import")) + wrong_keyword(k, "mark_for_import"); + + k = read_keyword(st); + } + + def->read(st, k); // updates k + } + else if (prj) + init_font(); + + if (!strcmp(k, "associated_class_diagram")) + { + // old format + set_associated_diagram(BrowserClassDiagram::read_ref(st, "classdiagram_ref"), + TRUE); + k = read_keyword(st); + } + else if (!strcmp(k, "associated_diagram")) + { + set_associated_diagram(BrowserDiagram::read_diagram_ref(st), TRUE); + k = read_keyword(st); + } + + BrowserNode::read(st, k, id); // updates k + + if (strcmp(k, "end")) + { + 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)) + k = read_keyword(st); + + if (!strcmp(k, "preserve_bodies")) + { + if (!in_import() && !preserve_bodies()) + toggle_preserve_bodies(); + + if (add_operation_profile()) + toggle_add_operation_profile(); + + k = read_keyword(st); + } + else + { + if (preserve_bodies()) + toggle_preserve_bodies(); + + if (!strcmp(k, "add_operation_profile")) { + if (!in_import() && !add_operation_profile()) + toggle_add_operation_profile(); + + k = read_keyword(st); + } + else if (add_operation_profile()) + toggle_add_operation_profile(); + } + + if (strcmp(k, "end")) + wrong_keyword(k, "end"); + } + } + catch (int) { + err = TRUE; + } + + POST_TRY; + + delete [] s; + + if (!err && (this == BrowserView::get_project())) { + Tool::read(); + + if (read_file_format() > 6) { + GenerationSettings::read(); + + if (read_file_format() > 7) + read_stereotypes(); + } + + GenerationSettings::read_includes_imports(); + } + + restore_context(context); + + if (err) { + THROW_ERROR 0; + } + } + else { + THROW_ERROR 0; + } + + is_imported = is_modified = in_import(); + + return result; +} + +bool BrowserPackage::load_version(QString fn) +{ + QFileInfo any_fi(fn); + QDir d(any_fi.dirPath(TRUE)); + const QFileInfoList l = d.entryInfoList("*.prj"); // [lgfreitas] entryInfoList does not return a pointer anymore + + if (!l.empty()) { + QListIterator it(l); + QFileInfo fi = it.next(); // [lgfreitas] there is no it.current anymore to QList. Java-style iterators + + if (fi.exists()) { + fn = fi.absFilePath(); + + char * s = read_file(fn); + + if (s == 0) { + msg_critical(TR("Error"), TR("can't read project file")); + return FALSE; + } + + bool ok = TRUE; + + PRE_TRY; + + try { + char * st = s; + + read_keyword(st, "format"); + 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")); + throw 0; + } + } + catch (int) { + ok = FALSE; + } + + POST_TRY; + + delete [] s; + + return ok; + } + } + + msg_critical(TR("Error"), TR("can't find project file")); + + return FALSE; +} + + +BrowserPackage * BrowserPackage::read_ref(char *& st) +{ + read_keyword(st, "package_ref"); + + int id = read_id(st); + BrowserPackage * result = all[id]; + + return (result == 0) + ? new BrowserPackage(id) + : result; +} + +BrowserPackage * BrowserPackage::read(char *& st, char * k, + BrowserNode * parent, + bool recursive) +{ + if (!strcmp(k, "package_ref")) { + int id = read_id(st); + + BrowserPackage * r = all[id]; + + if (r == 0) + r = (parent) + ? new BrowserPackage("", parent, id) + : new BrowserPackage(id); + else if (parent != 0) { + r->set_parent(parent); + r->set_name(""); + } + + if (recursive) + r->load(recursive, id); + + return r; + } + else + return 0; +} + +void BrowserPackage::package_modified() +{ + repaint(); + is_modified = TRUE; +} + +void BrowserPackage::renumber(int phase) +{ + switch (phase) { + case -1: { + BrowserNode::renumber(phase); + + QDir dir = BrowserView::get_dir(); + const QFileInfoList l = dir.entryInfoList(); + + if (!l.empty()) { + QListIterator it(l); + QFileInfo fi; + + //[lgfreitas] Qlist changed + while (it.hasNext()) { + fi = it.next(); + + if (fi.isFile() && fi.baseName().at(0).isDigit()) + dir.rename(fi.fileName(), "_" + fi.fileName()); + + //++it; + } + } + + clear(FALSE); + set_user_id(0); + } + + return; + + default: { + QDir dir = BrowserView::get_dir(); + QString old = "_" + QString::number(get_ident()); + + new_ident(phase, all); + dir.rename(old, QString::number(get_ident())); + BrowserNode::renumber(phase); + } + + return; + + case 2: { + QDir dir = BrowserView::get_dir(); + QString filter = "_*"; + const QFileInfoList l = dir.entryInfoList(filter); //[lgfreitas] QList has changed... + + if (!l.empty()) { + QListIterator it(l); + QFileInfo fi; + + // [lgfreitas] QList has changed + while (it.hasNext()) { + fi = it.next(); + QFile::remove(fi.absFilePath()); + //++it; + } + } + } + } +} From f3a41d0618a6b4a6ee9f9edf5b18dde3e4d83d06 Mon Sep 17 00:00:00 2001 From: pasgui Date: Tue, 21 May 2013 19:57:55 +0200 Subject: [PATCH 093/297] Fixes Makefile for packaging and local install. --- Makefile | 20 ++++++++++---------- README.md | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 7c040eccf..14d2b7f77 100644 --- a/Makefile +++ b/Makefile @@ -28,13 +28,13 @@ DOUML_ICONS_PREFIX_DIR = /usr/share/icons/hicolor # The copy is done if you uncomment the definition. DOUML_UNIX_PIXMAPS_DIR = /usr/share/pixmaps -# for packaging purpose, useless by default +# 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 - DESTDIR = ${PWD}/install -endif - -ifndef DEB_DESTDIR - DEB_DESTDIR = ${DESTDIR} + ifndef LOCAL_DESTDIR + LOCAL_DESTDIR = ${PWD}/install + endif + DESTDIR = ${LOCAL_DESTDIR} endif QMAKE=qmake @@ -117,11 +117,11 @@ install: cp -p *.lang "$(DESTDIR)$(DOUML_LOCALE_DIR)" for i in $(PROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)" ; done echo "#!/bin/sh" >$(DESTDIR)$(DOUML_DIR)/douml - echo "PATH=$(DEB_DESTDIR)$(DOUML_LIB):$$"PATH >>$(DESTDIR)$(DOUML_DIR)/douml - echo "DOUML_LIB_DIR=$(DEB_DESTDIR)$(DOUML_LIB)" >>$(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 $(DEB_DESTDIR)$(DOUML_LIB)/douml \"$$"@"\"" >>$(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 \ @@ -132,7 +132,7 @@ install: 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=$(DEB_DESTDIR)$(DOUML_DIR)/douml" >> "$(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" ; \ diff --git a/README.md b/README.md index d2b425116..a50b2f0eb 100644 --- a/README.md +++ b/README.md @@ -131,8 +131,8 @@ Compiling #### Under Linux: * dependencies: libqt4-dev, libqt4-qt3support, libboost-dev, libfile-fcntllock-perl, vim-common, g++ (>=4.7) - * make - * make install or make install DESTDIR=[path] + * `make` + * `make install` default directory is ${PWD}/install or `make install LOCAL_DESTDIR=[path]` #### Under Windows: From 893d0b8dbfa84176f66e35718c088f594fe41391 Mon Sep 17 00:00:00 2001 From: Sergey Shambir Date: Wed, 15 May 2013 22:46:03 +0400 Subject: [PATCH 094/297] Replaced same_drawing_settings() with clone_drawing_settings(). New method is simplier and doesn't use Q3PtrListIterator. --- src/diagram/ActivityActionCanvas.cpp | 19 +++++---------- src/diagram/ActivityActionCanvas.h | 2 +- src/diagram/ActivityCanvas.cpp | 15 ++++-------- src/diagram/ActivityCanvas.h | 2 +- src/diagram/ActivityObjectCanvas.cpp | 19 +++++---------- src/diagram/ActivityObjectCanvas.h | 2 +- src/diagram/ActivityPartitionCanvas.cpp | 15 ++++-------- src/diagram/ActivityPartitionCanvas.h | 2 +- src/diagram/ArtifactCanvas.cpp | 15 ++++-------- src/diagram/ArtifactCanvas.h | 2 +- src/diagram/CdClassCanvas.cpp | 19 +++++---------- src/diagram/CdClassCanvas.h | 2 +- src/diagram/CodClassInstCanvas.cpp | 19 +++++---------- src/diagram/CodClassInstCanvas.h | 2 +- src/diagram/ComponentCanvas.cpp | 17 ++++---------- src/diagram/ComponentCanvas.h | 2 +- src/diagram/ConstraintCanvas.cpp | 15 ++++-------- src/diagram/ConstraintCanvas.h | 2 +- src/diagram/DeploymentNodeCanvas.cpp | 19 +++++---------- src/diagram/DeploymentNodeCanvas.h | 2 +- src/diagram/DiagramItem.cpp | 2 +- src/diagram/DiagramItem.h | 2 +- src/diagram/DiagramView.cpp | 17 ++++++++++---- src/diagram/ExpansionNodeCanvas.cpp | 15 ++++-------- src/diagram/ExpansionNodeCanvas.h | 2 +- src/diagram/ExpansionRegionCanvas.cpp | 15 ++++-------- src/diagram/ExpansionRegionCanvas.h | 2 +- src/diagram/FlowCanvas.cpp | 19 +++++---------- src/diagram/FlowCanvas.h | 2 +- src/diagram/FragmentCanvas.cpp | 15 ++++-------- src/diagram/FragmentCanvas.h | 2 +- src/diagram/InfoCanvas.cpp | 15 ++++-------- src/diagram/InfoCanvas.h | 2 +- .../InterruptibleActivityRegionCanvas.cpp | 15 ++++-------- .../InterruptibleActivityRegionCanvas.h | 2 +- src/diagram/NoteCanvas.cpp | 15 ++++-------- src/diagram/NoteCanvas.h | 2 +- src/diagram/OdClassInstCanvas.cpp | 19 +++++---------- src/diagram/OdClassInstCanvas.h | 2 +- src/diagram/PackageCanvas.cpp | 21 ++++++----------- src/diagram/PackageCanvas.h | 2 +- src/diagram/ParameterCanvas.cpp | 15 ++++-------- src/diagram/ParameterCanvas.h | 2 +- src/diagram/ParameterSetCanvas.cpp | 15 ++++-------- src/diagram/ParameterSetCanvas.h | 2 +- src/diagram/PinCanvas.cpp | 15 ++++-------- src/diagram/PinCanvas.h | 2 +- src/diagram/SdClassInstCanvas.cpp | 21 ++++++----------- src/diagram/SdClassInstCanvas.h | 2 +- src/diagram/SdContinuationCanvas.cpp | 15 ++++-------- src/diagram/SdContinuationCanvas.h | 2 +- src/diagram/SdDurationCanvas.cpp | 15 ++++-------- src/diagram/SdDurationCanvas.h | 2 +- src/diagram/SdMsgCanvas.cpp | 19 +++++---------- src/diagram/SdMsgCanvas.h | 2 +- src/diagram/SdSelfMsgCanvas.cpp | 19 +++++---------- src/diagram/SdSelfMsgCanvas.h | 2 +- src/diagram/StateActionCanvas.cpp | 19 +++++---------- src/diagram/StateActionCanvas.h | 2 +- src/diagram/StateCanvas.cpp | 17 ++++---------- src/diagram/StateCanvas.h | 2 +- src/diagram/StereotypePropertiesCanvas.cpp | 15 ++++-------- src/diagram/StereotypePropertiesCanvas.h | 2 +- src/diagram/SubjectCanvas.cpp | 15 ++++-------- src/diagram/SubjectCanvas.h | 2 +- src/diagram/TransitionCanvas.cpp | 23 +++++++------------ src/diagram/TransitionCanvas.h | 2 +- src/diagram/UcClassCanvas.cpp | 19 +++++---------- src/diagram/UcClassCanvas.h | 2 +- src/diagram/UcUseCaseCanvas.cpp | 15 ++++-------- src/diagram/UcUseCaseCanvas.h | 2 +- 71 files changed, 219 insertions(+), 448 deletions(-) diff --git a/src/diagram/ActivityActionCanvas.cpp b/src/diagram/ActivityActionCanvas.cpp index e44dfe208..f35dc6ea5 100644 --- a/src/diagram/ActivityActionCanvas.cpp +++ b/src/diagram/ActivityActionCanvas.cpp @@ -1082,20 +1082,13 @@ void ActivityActionCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ActivityActionCanvas::same_drawing_settings(Q3PtrList & l) +void ActivityActionCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ActivityActionCanvas.h b/src/diagram/ActivityActionCanvas.h index 029fd31bc..ed0f15ac0 100644 --- a/src/diagram/ActivityActionCanvas.h +++ b/src/diagram/ActivityActionCanvas.h @@ -116,7 +116,7 @@ class ActivityActionCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/ActivityCanvas.cpp b/src/diagram/ActivityCanvas.cpp index c62818ba5..d271469ff 100644 --- a/src/diagram/ActivityCanvas.cpp +++ b/src/diagram/ActivityCanvas.cpp @@ -823,18 +823,11 @@ void ActivityCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ActivityCanvas::same_drawing_settings(Q3PtrList & l) +void ActivityCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ActivityCanvas.h b/src/diagram/ActivityCanvas.h index d33cb2658..bfac5dc8f 100644 --- a/src/diagram/ActivityCanvas.h +++ b/src/diagram/ActivityCanvas.h @@ -108,7 +108,7 @@ class ActivityCanvas : public QObject, public ActivityContainerCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); void edit_drawing_settings(); diff --git a/src/diagram/ActivityObjectCanvas.cpp b/src/diagram/ActivityObjectCanvas.cpp index 4696cc5c0..ebdf17bd0 100644 --- a/src/diagram/ActivityObjectCanvas.cpp +++ b/src/diagram/ActivityObjectCanvas.cpp @@ -710,20 +710,13 @@ void ActivityObjectCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ActivityObjectCanvas::same_drawing_settings(Q3PtrList & l) +void ActivityObjectCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ActivityObjectCanvas.h b/src/diagram/ActivityObjectCanvas.h index f820f2d79..0bcf499f7 100644 --- a/src/diagram/ActivityObjectCanvas.h +++ b/src/diagram/ActivityObjectCanvas.h @@ -87,7 +87,7 @@ class ActivityObjectCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); void edit_drawing_settings(); diff --git a/src/diagram/ActivityPartitionCanvas.cpp b/src/diagram/ActivityPartitionCanvas.cpp index 080f05ae8..fdc45485c 100644 --- a/src/diagram/ActivityPartitionCanvas.cpp +++ b/src/diagram/ActivityPartitionCanvas.cpp @@ -631,18 +631,11 @@ void ActivityPartitionCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ActivityPartitionCanvas::same_drawing_settings(Q3PtrList & l) +void ActivityPartitionCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ActivityPartitionCanvas.h b/src/diagram/ActivityPartitionCanvas.h index 14978c169..879b1c91f 100644 --- a/src/diagram/ActivityPartitionCanvas.h +++ b/src/diagram/ActivityPartitionCanvas.h @@ -87,7 +87,7 @@ class ActivityPartitionCanvas : public QObject, public ActivityContainerCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/ArtifactCanvas.cpp b/src/diagram/ArtifactCanvas.cpp index 6f0736f77..5a0cc4260 100644 --- a/src/diagram/ArtifactCanvas.cpp +++ b/src/diagram/ArtifactCanvas.cpp @@ -813,18 +813,11 @@ void ArtifactCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ArtifactCanvas::same_drawing_settings(Q3PtrList & l) +void ArtifactCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ArtifactCanvas.h b/src/diagram/ArtifactCanvas.h index b8237ced2..53f8fb27e 100644 --- a/src/diagram/ArtifactCanvas.h +++ b/src/diagram/ArtifactCanvas.h @@ -86,7 +86,7 @@ class ArtifactCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); void edit_drawing_settings(); diff --git a/src/diagram/CdClassCanvas.cpp b/src/diagram/CdClassCanvas.cpp index b61a3a5f3..46cc43bcb 100644 --- a/src/diagram/CdClassCanvas.cpp +++ b/src/diagram/CdClassCanvas.cpp @@ -1709,20 +1709,13 @@ void CdClassCanvas::edit_drawing_settings(Q3PtrList & l) } } -void CdClassCanvas::same_drawing_settings(Q3PtrList & l) +void CdClassCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/CdClassCanvas.h b/src/diagram/CdClassCanvas.h index d5bfd4d7a..8d4f7b3d7 100644 --- a/src/diagram/CdClassCanvas.h +++ b/src/diagram/CdClassCanvas.h @@ -113,7 +113,7 @@ class CdClassCanvas : public QObject, public DiagramCanvas, virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/CodClassInstCanvas.cpp b/src/diagram/CodClassInstCanvas.cpp index 5479328ff..5751a23ad 100644 --- a/src/diagram/CodClassInstCanvas.cpp +++ b/src/diagram/CodClassInstCanvas.cpp @@ -482,20 +482,13 @@ void CodClassInstCanvas::edit_drawing_settings(Q3PtrList & l) } } -void CodClassInstCanvas::same_drawing_settings(Q3PtrList & l) +void CodClassInstCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/CodClassInstCanvas.h b/src/diagram/CodClassInstCanvas.h index c0cb34c34..3e074f05a 100644 --- a/src/diagram/CodClassInstCanvas.h +++ b/src/diagram/CodClassInstCanvas.h @@ -80,7 +80,7 @@ class CodClassInstCanvas : public QObject, public CodObjCanvas, public ClassInst virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual bool get_show_stereotype_properties() const; virtual void apply_shortcut(QString s); diff --git a/src/diagram/ComponentCanvas.cpp b/src/diagram/ComponentCanvas.cpp index e54827ed2..748c3bd43 100644 --- a/src/diagram/ComponentCanvas.cpp +++ b/src/diagram/ComponentCanvas.cpp @@ -1070,19 +1070,12 @@ void ComponentCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ComponentCanvas::same_drawing_settings(Q3PtrList & l) +void ComponentCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ComponentCanvas.h b/src/diagram/ComponentCanvas.h index 27cf085c2..9f00b7f7a 100644 --- a/src/diagram/ComponentCanvas.h +++ b/src/diagram/ComponentCanvas.h @@ -101,7 +101,7 @@ class ComponentCanvas : public QObject, public DiagramCanvas, virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/ConstraintCanvas.cpp b/src/diagram/ConstraintCanvas.cpp index a301a4b61..f43553072 100644 --- a/src/diagram/ConstraintCanvas.cpp +++ b/src/diagram/ConstraintCanvas.cpp @@ -271,18 +271,11 @@ void ConstraintCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ConstraintCanvas::same_drawing_settings(Q3PtrList & l) +void ConstraintCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ConstraintCanvas.h b/src/diagram/ConstraintCanvas.h index 5f85c8419..453542ed1 100644 --- a/src/diagram/ConstraintCanvas.h +++ b/src/diagram/ConstraintCanvas.h @@ -68,7 +68,7 @@ class ConstraintCanvas : public NoteCanvas virtual void apply_shortcut(QString s); virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void save(QTextStream & st, bool ref, QString & warning) const; static ConstraintCanvas * read(char *& , UmlCanvas *, char *, CdClassCanvas *); diff --git a/src/diagram/DeploymentNodeCanvas.cpp b/src/diagram/DeploymentNodeCanvas.cpp index f1d2f653f..a070eabdc 100644 --- a/src/diagram/DeploymentNodeCanvas.cpp +++ b/src/diagram/DeploymentNodeCanvas.cpp @@ -660,20 +660,13 @@ void DeploymentNodeCanvas::edit_drawing_settings(Q3PtrList & l) } } -void DeploymentNodeCanvas::same_drawing_settings(Q3PtrList & l) +void DeploymentNodeCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/DeploymentNodeCanvas.h b/src/diagram/DeploymentNodeCanvas.h index 69eefd591..42e50264c 100644 --- a/src/diagram/DeploymentNodeCanvas.h +++ b/src/diagram/DeploymentNodeCanvas.h @@ -96,7 +96,7 @@ class DeploymentNodeCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/DiagramItem.cpp b/src/diagram/DiagramItem.cpp index 0b735b9e1..123deb389 100644 --- a/src/diagram/DiagramItem.cpp +++ b/src/diagram/DiagramItem.cpp @@ -405,7 +405,7 @@ void DiagramItem::edit_drawing_settings(Q3PtrList &) // never called } -void DiagramItem::same_drawing_settings(Q3PtrList &) +void DiagramItem::clone_drawing_settings(const DiagramItem *src) { // never called } diff --git a/src/diagram/DiagramItem.h b/src/diagram/DiagramItem.h index 962e91554..304ec1755 100644 --- a/src/diagram/DiagramItem.h +++ b/src/diagram/DiagramItem.h @@ -134,7 +134,7 @@ class DiagramItem : public Labeled virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString); diff --git a/src/diagram/DiagramView.cpp b/src/diagram/DiagramView.cpp index 18c4d0cad..ac622a2d3 100644 --- a/src/diagram/DiagramView.cpp +++ b/src/diagram/DiagramView.cpp @@ -1158,9 +1158,13 @@ void DiagramView::multiple_selection_menu(bool in_model, bool out_model, same_size(TRUE, TRUE); break; - case 17: + case 17: { history_protected = FALSE; - l_drawing_settings.first()->same_drawing_settings(l_drawing_settings); + Q3PtrListIterator it(l_drawing_settings); + const DiagramItem *source = it.current(); + while (++it, it.current() != 0) + it.current()->clone_drawing_settings(source); + } default: return; @@ -1475,8 +1479,13 @@ 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; + Q3PtrListIterator it(l); + const DiagramItem *source = it.current(); + while (++it, it.current() != 0) + it.current()->clone_drawing_settings(source); + } } } else if (s == "Align bottom") { diff --git a/src/diagram/ExpansionNodeCanvas.cpp b/src/diagram/ExpansionNodeCanvas.cpp index afd4f74a4..a06d01262 100644 --- a/src/diagram/ExpansionNodeCanvas.cpp +++ b/src/diagram/ExpansionNodeCanvas.cpp @@ -469,18 +469,11 @@ void ExpansionNodeCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ExpansionNodeCanvas::same_drawing_settings(Q3PtrList & l) +void ExpansionNodeCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ExpansionNodeCanvas.h b/src/diagram/ExpansionNodeCanvas.h index 39f2f54cb..ece268512 100644 --- a/src/diagram/ExpansionNodeCanvas.h +++ b/src/diagram/ExpansionNodeCanvas.h @@ -83,7 +83,7 @@ class ExpansionNodeCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/ExpansionRegionCanvas.cpp b/src/diagram/ExpansionRegionCanvas.cpp index 2b403caf9..486103b27 100644 --- a/src/diagram/ExpansionRegionCanvas.cpp +++ b/src/diagram/ExpansionRegionCanvas.cpp @@ -638,18 +638,11 @@ void ExpansionRegionCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ExpansionRegionCanvas::same_drawing_settings(Q3PtrList & l) +void ExpansionRegionCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ExpansionRegionCanvas.h b/src/diagram/ExpansionRegionCanvas.h index c95c7c7ed..a87f74174 100644 --- a/src/diagram/ExpansionRegionCanvas.h +++ b/src/diagram/ExpansionRegionCanvas.h @@ -107,7 +107,7 @@ class ExpansionRegionCanvas : public QObject, public ActivityContainerCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/FlowCanvas.cpp b/src/diagram/FlowCanvas.cpp index 33719cbb7..5f03dab21 100644 --- a/src/diagram/FlowCanvas.cpp +++ b/src/diagram/FlowCanvas.cpp @@ -454,20 +454,13 @@ void FlowCanvas::edit_drawing_settings(Q3PtrList & l) } } -void FlowCanvas::same_drawing_settings(Q3PtrList & l) +void FlowCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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) diff --git a/src/diagram/FlowCanvas.h b/src/diagram/FlowCanvas.h index ae4cbe029..e2f839ce9 100644 --- a/src/diagram/FlowCanvas.h +++ b/src/diagram/FlowCanvas.h @@ -79,7 +79,7 @@ class FlowCanvas : public ArrowCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/FragmentCanvas.cpp b/src/diagram/FragmentCanvas.cpp index 651a4f8b9..febd599e8 100644 --- a/src/diagram/FragmentCanvas.cpp +++ b/src/diagram/FragmentCanvas.cpp @@ -507,18 +507,11 @@ void FragmentCanvas::edit_drawing_settings(Q3PtrList & l) } } -void FragmentCanvas::same_drawing_settings(Q3PtrList & l) +void FragmentCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/FragmentCanvas.h b/src/diagram/FragmentCanvas.h index 175d12616..dad91a4b6 100644 --- a/src/diagram/FragmentCanvas.h +++ b/src/diagram/FragmentCanvas.h @@ -87,7 +87,7 @@ class FragmentCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/InfoCanvas.cpp b/src/diagram/InfoCanvas.cpp index de17ca042..b72675316 100644 --- a/src/diagram/InfoCanvas.cpp +++ b/src/diagram/InfoCanvas.cpp @@ -251,18 +251,11 @@ void InfoCanvas::edit_drawing_settings(Q3PtrList & l) } } -void InfoCanvas::same_drawing_settings(Q3PtrList & l) +void InfoCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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..bfe1ec673 100644 --- a/src/diagram/InfoCanvas.h +++ b/src/diagram/InfoCanvas.h @@ -53,7 +53,7 @@ class InfoCanvas : public NoteCanvas virtual void apply_shortcut(QString s); virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void save(QTextStream & st, bool ref, QString & warning) const; static InfoCanvas * read(char *& , UmlCanvas *, char *, DiagramItem *); diff --git a/src/diagram/InterruptibleActivityRegionCanvas.cpp b/src/diagram/InterruptibleActivityRegionCanvas.cpp index 5227a2cd9..d4ce4905c 100644 --- a/src/diagram/InterruptibleActivityRegionCanvas.cpp +++ b/src/diagram/InterruptibleActivityRegionCanvas.cpp @@ -427,18 +427,11 @@ void InterruptibleActivityRegionCanvas::edit_drawing_settings(Q3PtrList & l) +void InterruptibleActivityRegionCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/InterruptibleActivityRegionCanvas.h b/src/diagram/InterruptibleActivityRegionCanvas.h index 2bf4519e0..c90b859cd 100644 --- a/src/diagram/InterruptibleActivityRegionCanvas.h +++ b/src/diagram/InterruptibleActivityRegionCanvas.h @@ -81,7 +81,7 @@ class InterruptibleActivityRegionCanvas : public QObject, public ActivityContain virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/NoteCanvas.cpp b/src/diagram/NoteCanvas.cpp index 60da5dbaf..78fa8e36c 100644 --- a/src/diagram/NoteCanvas.cpp +++ b/src/diagram/NoteCanvas.cpp @@ -381,18 +381,11 @@ void NoteCanvas::edit_drawing_settings(Q3PtrList & l) } } -void NoteCanvas::same_drawing_settings(Q3PtrList & l) +void NoteCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/NoteCanvas.h b/src/diagram/NoteCanvas.h index 8b8a6f1b7..708f78c4a 100644 --- a/src/diagram/NoteCanvas.h +++ b/src/diagram/NoteCanvas.h @@ -76,7 +76,7 @@ class NoteCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/OdClassInstCanvas.cpp b/src/diagram/OdClassInstCanvas.cpp index af4be7a12..d156b456f 100644 --- a/src/diagram/OdClassInstCanvas.cpp +++ b/src/diagram/OdClassInstCanvas.cpp @@ -747,20 +747,13 @@ void OdClassInstCanvas::edit_drawing_settings(Q3PtrList & l) } } -void OdClassInstCanvas::same_drawing_settings(Q3PtrList & l) +void OdClassInstCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/OdClassInstCanvas.h b/src/diagram/OdClassInstCanvas.h index 4b83fcc69..9beda0edf 100644 --- a/src/diagram/OdClassInstCanvas.h +++ b/src/diagram/OdClassInstCanvas.h @@ -87,7 +87,7 @@ class OdClassInstCanvas : public QObject, public DiagramCanvas, virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/PackageCanvas.cpp b/src/diagram/PackageCanvas.cpp index f5db4eab9..595bda5a5 100644 --- a/src/diagram/PackageCanvas.cpp +++ b/src/diagram/PackageCanvas.cpp @@ -695,21 +695,14 @@ void PackageCanvas::edit_drawing_settings(Q3PtrList & l) } } -void PackageCanvas::same_drawing_settings(Q3PtrList & l) +void PackageCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/PackageCanvas.h b/src/diagram/PackageCanvas.h index 9ceeaf737..8d186aec6 100644 --- a/src/diagram/PackageCanvas.h +++ b/src/diagram/PackageCanvas.h @@ -78,7 +78,7 @@ class PackageCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/ParameterCanvas.cpp b/src/diagram/ParameterCanvas.cpp index 1350f18fe..4c472a1bd 100644 --- a/src/diagram/ParameterCanvas.cpp +++ b/src/diagram/ParameterCanvas.cpp @@ -537,18 +537,11 @@ void ParameterCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ParameterCanvas::same_drawing_settings(Q3PtrList & l) +void ParameterCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ParameterCanvas.h b/src/diagram/ParameterCanvas.h index 83411287b..11fec8831 100644 --- a/src/diagram/ParameterCanvas.h +++ b/src/diagram/ParameterCanvas.h @@ -80,7 +80,7 @@ class ParameterCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/ParameterSetCanvas.cpp b/src/diagram/ParameterSetCanvas.cpp index 8663e76e8..c8a057117 100644 --- a/src/diagram/ParameterSetCanvas.cpp +++ b/src/diagram/ParameterSetCanvas.cpp @@ -462,18 +462,11 @@ void ParameterSetCanvas::edit_drawing_settings(Q3PtrList & l) } } -void ParameterSetCanvas::same_drawing_settings(Q3PtrList & l) +void ParameterSetCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/ParameterSetCanvas.h b/src/diagram/ParameterSetCanvas.h index d15dad867..c50c6a49f 100644 --- a/src/diagram/ParameterSetCanvas.h +++ b/src/diagram/ParameterSetCanvas.h @@ -78,7 +78,7 @@ class ParameterSetCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/PinCanvas.cpp b/src/diagram/PinCanvas.cpp index 78cdf852b..88b22a5c4 100644 --- a/src/diagram/PinCanvas.cpp +++ b/src/diagram/PinCanvas.cpp @@ -538,18 +538,11 @@ void PinCanvas::edit_drawing_settings(Q3PtrList & l) } } -void PinCanvas::same_drawing_settings(Q3PtrList & l) +void PinCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/PinCanvas.h b/src/diagram/PinCanvas.h index e3df1d935..ca1f67974 100644 --- a/src/diagram/PinCanvas.h +++ b/src/diagram/PinCanvas.h @@ -77,7 +77,7 @@ class PinCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/SdClassInstCanvas.cpp b/src/diagram/SdClassInstCanvas.cpp index f07dcef85..e3ce0671e 100644 --- a/src/diagram/SdClassInstCanvas.cpp +++ b/src/diagram/SdClassInstCanvas.cpp @@ -633,21 +633,14 @@ void SdClassInstCanvas::edit_drawing_settings(Q3PtrList & l) } } -void SdClassInstCanvas::same_drawing_settings(Q3PtrList & l) +void SdClassInstCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/SdClassInstCanvas.h b/src/diagram/SdClassInstCanvas.h index e546122ae..8c603200f 100644 --- a/src/diagram/SdClassInstCanvas.h +++ b/src/diagram/SdClassInstCanvas.h @@ -79,7 +79,7 @@ class SdClassInstCanvas : public QObject, public SdObjCanvas, public ClassInstCa virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/SdContinuationCanvas.cpp b/src/diagram/SdContinuationCanvas.cpp index da6f80273..f8dc3b579 100644 --- a/src/diagram/SdContinuationCanvas.cpp +++ b/src/diagram/SdContinuationCanvas.cpp @@ -336,18 +336,11 @@ void SdContinuationCanvas::edit_drawing_settings(Q3PtrList & l) } } -void SdContinuationCanvas::same_drawing_settings(Q3PtrList & l) +void SdContinuationCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/SdContinuationCanvas.h b/src/diagram/SdContinuationCanvas.h index d20850a56..15754346f 100644 --- a/src/diagram/SdContinuationCanvas.h +++ b/src/diagram/SdContinuationCanvas.h @@ -72,7 +72,7 @@ class SdContinuationCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/SdDurationCanvas.cpp b/src/diagram/SdDurationCanvas.cpp index d305feb84..fa15429f7 100644 --- a/src/diagram/SdDurationCanvas.cpp +++ b/src/diagram/SdDurationCanvas.cpp @@ -925,18 +925,11 @@ void SdDurationCanvas::edit_drawing_settings(Q3PtrList & l) } } -void SdDurationCanvas::same_drawing_settings(Q3PtrList & l) +void SdDurationCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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) diff --git a/src/diagram/SdDurationCanvas.h b/src/diagram/SdDurationCanvas.h index 13700125f..cdaeaca10 100644 --- a/src/diagram/SdDurationCanvas.h +++ b/src/diagram/SdDurationCanvas.h @@ -120,7 +120,7 @@ class SdDurationCanvas : public QObject, public SdMsgSupport, public SdDurationS virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); void edit_drawing_settings(); diff --git a/src/diagram/SdMsgCanvas.cpp b/src/diagram/SdMsgCanvas.cpp index 58967098d..4e72754ac 100644 --- a/src/diagram/SdMsgCanvas.cpp +++ b/src/diagram/SdMsgCanvas.cpp @@ -471,20 +471,13 @@ void SdMsgCanvas::edit_drawing_settings(Q3PtrList & l) } } -void SdMsgCanvas::same_drawing_settings(Q3PtrList & l) +void SdMsgCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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() diff --git a/src/diagram/SdMsgCanvas.h b/src/diagram/SdMsgCanvas.h index 8ab3343bc..bf4b6b99b 100644 --- a/src/diagram/SdMsgCanvas.h +++ b/src/diagram/SdMsgCanvas.h @@ -65,7 +65,7 @@ class SdMsgCanvas : public SdMsgBaseCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); void edit_drawing_settings(); diff --git a/src/diagram/SdSelfMsgCanvas.cpp b/src/diagram/SdSelfMsgCanvas.cpp index 5481fc2d4..6125e3c86 100644 --- a/src/diagram/SdSelfMsgCanvas.cpp +++ b/src/diagram/SdSelfMsgCanvas.cpp @@ -452,20 +452,13 @@ void SdSelfMsgCanvas::edit_drawing_settings(Q3PtrList & l) } } -void SdSelfMsgCanvas::same_drawing_settings(Q3PtrList & l) +void SdSelfMsgCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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() diff --git a/src/diagram/SdSelfMsgCanvas.h b/src/diagram/SdSelfMsgCanvas.h index cfdcb55aa..33d8d866a 100644 --- a/src/diagram/SdSelfMsgCanvas.h +++ b/src/diagram/SdSelfMsgCanvas.h @@ -54,7 +54,7 @@ class SdSelfMsgCanvas : public SdMsgBaseCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); void edit_drawing_settings(); diff --git a/src/diagram/StateActionCanvas.cpp b/src/diagram/StateActionCanvas.cpp index a27f71fbf..088675497 100644 --- a/src/diagram/StateActionCanvas.cpp +++ b/src/diagram/StateActionCanvas.cpp @@ -694,20 +694,13 @@ void StateActionCanvas::edit_drawing_settings(Q3PtrList & l) } } -void StateActionCanvas::same_drawing_settings(Q3PtrList & l) +void StateActionCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/StateActionCanvas.h b/src/diagram/StateActionCanvas.h index c17d5da33..701862091 100644 --- a/src/diagram/StateActionCanvas.h +++ b/src/diagram/StateActionCanvas.h @@ -86,7 +86,7 @@ class StateActionCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/StateCanvas.cpp b/src/diagram/StateCanvas.cpp index 5beb3cf88..167ca35ce 100644 --- a/src/diagram/StateCanvas.cpp +++ b/src/diagram/StateCanvas.cpp @@ -1484,19 +1484,12 @@ void StateCanvas::edit_drawing_settings(Q3PtrList & l) } } -void StateCanvas::same_drawing_settings(Q3PtrList & l) +void StateCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/StateCanvas.h b/src/diagram/StateCanvas.h index 970021c76..3d530c6a9 100644 --- a/src/diagram/StateCanvas.h +++ b/src/diagram/StateCanvas.h @@ -101,7 +101,7 @@ class StateCanvas : public QObject, public DiagramCanvas, public MultipleDepende virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/StereotypePropertiesCanvas.cpp b/src/diagram/StereotypePropertiesCanvas.cpp index 7d4c7add1..b5cb3621a 100644 --- a/src/diagram/StereotypePropertiesCanvas.cpp +++ b/src/diagram/StereotypePropertiesCanvas.cpp @@ -253,18 +253,11 @@ void StereotypePropertiesCanvas::edit_drawing_settings(Q3PtrList & } } -void StereotypePropertiesCanvas::same_drawing_settings(Q3PtrList & l) +void StereotypePropertiesCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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, diff --git a/src/diagram/StereotypePropertiesCanvas.h b/src/diagram/StereotypePropertiesCanvas.h index 4a8af9fae..c38c7f60a 100644 --- a/src/diagram/StereotypePropertiesCanvas.h +++ b/src/diagram/StereotypePropertiesCanvas.h @@ -60,7 +60,7 @@ class StereotypePropertiesCanvas : public NoteCanvas virtual void apply_shortcut(QString s); virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void save(QTextStream & st, bool ref, QString & warning) const; static StereotypePropertiesCanvas * read(char *& , UmlCanvas *, char *); diff --git a/src/diagram/SubjectCanvas.cpp b/src/diagram/SubjectCanvas.cpp index fc7d83894..d177d2300 100644 --- a/src/diagram/SubjectCanvas.cpp +++ b/src/diagram/SubjectCanvas.cpp @@ -344,18 +344,11 @@ void SubjectCanvas::edit_drawing_settings(Q3PtrList & l) } } -void SubjectCanvas::same_drawing_settings(Q3PtrList & l) +void SubjectCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/SubjectCanvas.h b/src/diagram/SubjectCanvas.h index 015a7ae36..1ffe23508 100644 --- a/src/diagram/SubjectCanvas.h +++ b/src/diagram/SubjectCanvas.h @@ -73,7 +73,7 @@ class SubjectCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); diff --git a/src/diagram/TransitionCanvas.cpp b/src/diagram/TransitionCanvas.cpp index 7d3ac3a2b..00b783a17 100644 --- a/src/diagram/TransitionCanvas.cpp +++ b/src/diagram/TransitionCanvas.cpp @@ -446,21 +446,14 @@ void TransitionCanvas::edit_drawing_settings(Q3PtrList & l) } } -void TransitionCanvas::same_drawing_settings(Q3PtrList & l) -{ - Q3PtrListIterator 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() - } +void TransitionCanvas::clone_drawing_settings(const DiagramItem *src) +{ + 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) diff --git a/src/diagram/TransitionCanvas.h b/src/diagram/TransitionCanvas.h index bb57d0592..0ec0b015e 100644 --- a/src/diagram/TransitionCanvas.h +++ b/src/diagram/TransitionCanvas.h @@ -74,7 +74,7 @@ class TransitionCanvas : public ArrowCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); void edit_drawing_settings(); diff --git a/src/diagram/UcClassCanvas.cpp b/src/diagram/UcClassCanvas.cpp index 83f5ead3f..16161112f 100644 --- a/src/diagram/UcClassCanvas.cpp +++ b/src/diagram/UcClassCanvas.cpp @@ -791,20 +791,13 @@ void UcClassCanvas::edit_drawing_settings(Q3PtrList & l) } } -void UcClassCanvas::same_drawing_settings(Q3PtrList & l) +void UcClassCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/UcClassCanvas.h b/src/diagram/UcClassCanvas.h index e11aaeaeb..eba211b59 100644 --- a/src/diagram/UcClassCanvas.h +++ b/src/diagram/UcClassCanvas.h @@ -81,7 +81,7 @@ class UcClassCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/UcUseCaseCanvas.cpp b/src/diagram/UcUseCaseCanvas.cpp index 57d1edd06..780fdafc7 100644 --- a/src/diagram/UcUseCaseCanvas.cpp +++ b/src/diagram/UcUseCaseCanvas.cpp @@ -493,18 +493,11 @@ void UcUseCaseCanvas::edit_drawing_settings(Q3PtrList & l) } } -void UcUseCaseCanvas::same_drawing_settings(Q3PtrList & l) +void UcUseCaseCanvas::clone_drawing_settings(const DiagramItem *src) { - Q3PtrListIterator 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 diff --git a/src/diagram/UcUseCaseCanvas.h b/src/diagram/UcUseCaseCanvas.h index d859f7b77..8a4199825 100644 --- a/src/diagram/UcUseCaseCanvas.h +++ b/src/diagram/UcUseCaseCanvas.h @@ -72,7 +72,7 @@ class UcUseCaseCanvas : public QObject, public DiagramCanvas virtual bool has_drawing_settings() const; virtual void edit_drawing_settings(Q3PtrList &); - virtual void same_drawing_settings(Q3PtrList &); + virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual void apply_shortcut(QString s); From b3e0ae40c2c624ce8ad7ac9622aff75802070ebe Mon Sep 17 00:00:00 2001 From: Sergey Shambir Date: Tue, 14 May 2013 16:47:08 +0400 Subject: [PATCH 095/297] Cleanup: replaced Q3PtrList with QList Makes code cleaner and nears Qt5 compatibility. 1. foreach used to iterate over lists (except reverse-order iteration); 2. since const T* cannot be attached to QList, const_cast used in some places; 3. removed "QString warning;" whenever seen. --- src/CppGenerator/CppRefType.cpp | 48 ++-- src/CppGenerator/CppRefType.h | 14 +- src/CppGenerator/UmlArtifact.cpp | 2 +- src/CppGenerator/UmlAttribute.cpp | 2 +- src/CppGenerator/UmlAttribute.h | 2 +- src/CppGenerator/UmlClass.cpp | 10 +- src/CppGenerator/UmlClass.h | 6 +- src/CppGenerator/UmlClassItem.h | 2 +- src/CppGenerator/UmlClassMember.cpp | 2 +- src/CppGenerator/UmlClassMember.h | 2 +- src/CppGenerator/UmlExtraClassMember.cpp | 2 +- src/CppGenerator/UmlExtraClassMember.h | 2 +- src/CppGenerator/UmlOperation.cpp | 2 +- src/CppGenerator/UmlOperation.h | 2 +- src/CppGenerator/UmlRelation.cpp | 2 +- src/CppGenerator/UmlRelation.h | 2 +- src/CppReverse/BrowserNode.h | 2 +- src/CppReverse/Class.cpp | 17 +- src/CppReverse/Class.h | 10 +- src/CppReverse/ClassContainer.h | 2 +- src/CppReverse/Package.cpp | 37 +-- src/CppReverse/Package.h | 6 +- src/CppReverse/TreeItem.h | 14 +- src/CppReverse/UmlArtifact.cpp | 2 +- src/CppReverse/UmlArtifact.h | 2 +- src/CppReverse/UmlAttribute.cpp | 2 +- src/CppReverse/UmlAttribute.h | 2 +- src/CppReverse/UmlClass.cpp | 21 +- src/CppReverse/UmlClass.h | 12 +- src/CppReverse/UmlClassItem.cpp | 2 +- src/CppReverse/UmlClassItem.h | 2 +- src/CppReverse/UmlClassView.cpp | 2 +- src/CppReverse/UmlClassView.h | 2 +- src/CppReverse/UmlDeploymentView.cpp | 20 +- src/CppReverse/UmlDeploymentView.h | 2 +- src/CppReverse/UmlItem.cpp | 2 +- src/CppReverse/UmlItem.h | 2 +- src/CppReverse/UmlOperation.cpp | 54 ++-- src/CppReverse/UmlOperation.h | 8 +- src/CppReverse/UmlPackage.cpp | 2 +- src/CppReverse/UmlPackage.h | 2 +- src/CppReverse/UmlRelation.cpp | 4 +- src/CppReverse/UmlRelation.h | 4 +- src/CppRoundtrip/main.cpp | 11 +- src/IdlGenerator/UmlArtifact.cpp | 2 +- src/JavaCat/BrowserNode.cpp | 10 +- src/JavaCat/BrowserNode.h | 5 +- src/JavaCat/BrowserSearchDialog.cpp | 4 +- src/JavaCat/Class.cpp | 57 +++- src/JavaCat/Class.h | 28 +- src/JavaCat/Package.cpp | 22 +- src/JavaCat/TreeItem.h | 15 +- src/JavaCat/UmlArtifact.cpp | 2 +- src/JavaCat/UmlArtifact.h | 2 +- src/JavaCat/UmlAttribute.cpp | 4 +- src/JavaCat/UmlAttribute.h | 4 +- src/JavaCat/UmlClass.cpp | 9 +- src/JavaCat/UmlClass.h | 4 +- src/JavaCat/UmlClassItem.cpp | 2 +- src/JavaCat/UmlClassItem.h | 2 +- src/JavaCat/UmlClassView.cpp | 2 +- src/JavaCat/UmlClassView.h | 2 +- src/JavaCat/UmlDeploymentView.cpp | 23 +- src/JavaCat/UmlDeploymentView.h | 2 +- src/JavaCat/UmlExtraClassMember.cpp | 2 +- src/JavaCat/UmlExtraClassMember.h | 2 +- src/JavaCat/UmlItem.cpp | 2 +- src/JavaCat/UmlItem.h | 2 +- src/JavaCat/UmlOperation.cpp | 13 +- src/JavaCat/UmlOperation.h | 2 +- src/JavaCat/UmlPackage.cpp | 2 +- src/JavaCat/UmlPackage.h | 2 +- src/JavaCat/UmlRelation.cpp | 4 +- src/JavaCat/UmlRelation.h | 4 +- src/JavaGenerator/UmlClassMember.cpp | 2 +- src/JavaGenerator/UmlExtraClassMember.cpp | 2 +- src/JavaRoundtrip/main.cpp | 12 +- src/PhpGenerator/UmlClassMember.cpp | 2 +- src/PhpGenerator/UmlExtraClassMember.cpp | 2 +- src/PhpReverse/BrowserNode.h | 2 +- src/PhpReverse/Class.cpp | 2 +- src/PhpReverse/Class.h | 2 +- src/PhpReverse/Package.cpp | 3 +- src/PhpReverse/TreeItem.h | 15 +- src/ProjectControl/BrowserNode.h | 2 +- src/ProjectSynchro/BrowserView.cpp | 6 +- src/ProjectSynchro/BrowserView.h | 2 +- src/ProjectSynchro/SynchroDialog.cpp | 2 +- src/ProjectSynchro/SynchroDialog.h | 6 +- src/ProjectSynchro/SynchroWindow.h | 4 +- src/browser/BrowserActivity.cpp | 18 +- src/browser/BrowserActivity.h | 6 +- src/browser/BrowserActivityAction.cpp | 18 +- src/browser/BrowserActivityAction.h | 6 +- src/browser/BrowserActivityDiagram.cpp | 10 +- src/browser/BrowserActivityDiagram.h | 4 +- src/browser/BrowserActivityNode.cpp | 4 +- src/browser/BrowserActivityNode.h | 2 +- src/browser/BrowserActivityObject.cpp | 18 +- src/browser/BrowserActivityObject.h | 6 +- src/browser/BrowserActivityPartition.cpp | 16 +- src/browser/BrowserActivityPartition.h | 4 +- src/browser/BrowserArtifact.cpp | 6 +- src/browser/BrowserArtifact.h | 6 +- src/browser/BrowserAttribute.cpp | 4 +- src/browser/BrowserAttribute.h | 4 +- src/browser/BrowserClass.cpp | 242 +++++++--------- src/browser/BrowserClass.h | 18 +- src/browser/BrowserClassDiagram.cpp | 10 +- src/browser/BrowserClassDiagram.h | 4 +- src/browser/BrowserClassInstance.cpp | 4 +- src/browser/BrowserClassInstance.h | 4 +- src/browser/BrowserClassView.cpp | 12 +- src/browser/BrowserClassView.h | 2 +- src/browser/BrowserColDiagram.cpp | 10 +- src/browser/BrowserColDiagram.h | 4 +- src/browser/BrowserComponent.cpp | 12 +- src/browser/BrowserComponent.h | 4 +- src/browser/BrowserComponentDiagram.cpp | 10 +- src/browser/BrowserComponentDiagram.h | 4 +- src/browser/BrowserComponentView.cpp | 12 +- src/browser/BrowserComponentView.h | 2 +- src/browser/BrowserDeploymentDiagram.cpp | 10 +- src/browser/BrowserDeploymentDiagram.h | 4 +- src/browser/BrowserDeploymentNode.cpp | 2 +- src/browser/BrowserDeploymentNode.h | 2 +- src/browser/BrowserDeploymentView.cpp | 12 +- src/browser/BrowserDeploymentView.h | 2 +- src/browser/BrowserExpansionNode.cpp | 4 +- src/browser/BrowserExpansionNode.h | 4 +- src/browser/BrowserExpansionRegion.cpp | 17 +- src/browser/BrowserExpansionRegion.h | 4 +- src/browser/BrowserFlow.cpp | 4 +- src/browser/BrowserFlow.h | 4 +- .../BrowserInterruptibleActivityRegion.cpp | 17 +- .../BrowserInterruptibleActivityRegion.h | 4 +- src/browser/BrowserNode.cpp | 258 ++++++++---------- src/browser/BrowserNode.h | 27 +- src/browser/BrowserObjectDiagram.cpp | 10 +- src/browser/BrowserObjectDiagram.h | 4 +- src/browser/BrowserOperation.cpp | 19 +- src/browser/BrowserOperation.h | 4 +- src/browser/BrowserPackage.cpp | 24 +- src/browser/BrowserPackage.h | 6 +- src/browser/BrowserParameter.cpp | 4 +- src/browser/BrowserParameter.h | 4 +- src/browser/BrowserParameterSet.cpp | 2 +- src/browser/BrowserParameterSet.h | 2 +- src/browser/BrowserPin.cpp | 4 +- src/browser/BrowserPin.h | 4 +- src/browser/BrowserPseudoState.cpp | 2 +- src/browser/BrowserPseudoState.h | 4 +- src/browser/BrowserRegion.cpp | 14 +- src/browser/BrowserRegion.h | 2 +- src/browser/BrowserRelation.cpp | 10 +- src/browser/BrowserRelation.h | 4 +- src/browser/BrowserSeqDiagram.cpp | 10 +- src/browser/BrowserSeqDiagram.h | 4 +- src/browser/BrowserSimpleRelation.cpp | 4 +- src/browser/BrowserSimpleRelation.h | 4 +- src/browser/BrowserState.cpp | 17 +- src/browser/BrowserState.h | 6 +- src/browser/BrowserStateAction.cpp | 2 +- src/browser/BrowserStateAction.h | 4 +- src/browser/BrowserStateDiagram.cpp | 10 +- src/browser/BrowserStateDiagram.h | 4 +- src/browser/BrowserTransition.cpp | 4 +- src/browser/BrowserTransition.h | 4 +- src/browser/BrowserUseCase.cpp | 18 +- src/browser/BrowserUseCase.h | 4 +- src/browser/BrowserUseCaseDiagram.cpp | 10 +- src/browser/BrowserUseCaseDiagram.h | 4 +- src/browser/BrowserUseCaseView.cpp | 12 +- src/browser/BrowserUseCaseView.h | 2 +- src/data/BasicData.cpp | 10 +- src/data/BasicData.h | 2 +- src/data/ClassData.cpp | 96 +++---- src/data/ClassData.h | 8 +- src/data/ClassInstanceData.cpp | 49 ++-- src/data/ClassInstanceData.h | 2 +- src/data/RelationData.cpp | 14 +- src/data/RelationData.h | 2 +- src/diagram/ActivityActionCanvas.cpp | 15 +- src/diagram/ActivityActionCanvas.h | 2 +- src/diagram/ActivityCanvas.cpp | 15 +- src/diagram/ActivityCanvas.h | 2 +- src/diagram/ActivityDiagramView.cpp | 7 +- src/diagram/ActivityObjectCanvas.cpp | 15 +- src/diagram/ActivityObjectCanvas.h | 2 +- src/diagram/ActivityPartitionCanvas.cpp | 11 +- src/diagram/ActivityPartitionCanvas.h | 2 +- src/diagram/ArrowCanvas.cpp | 36 +-- src/diagram/ArrowCanvas.h | 4 +- src/diagram/ArrowJunctionCanvas.cpp | 3 +- src/diagram/ArrowPointCanvas.cpp | 4 +- src/diagram/ArtifactCanvas.cpp | 49 ++-- src/diagram/ArtifactCanvas.h | 2 +- src/diagram/BrowserView.cpp | 7 +- src/diagram/CdClassCanvas.cpp | 77 ++---- src/diagram/CdClassCanvas.h | 2 +- src/diagram/ClassDiagramView.cpp | 36 +-- src/diagram/CodClassInstCanvas.cpp | 23 +- src/diagram/CodClassInstCanvas.h | 2 +- src/diagram/CodDirsCanvas.cpp | 16 +- src/diagram/CodMsgSupport.cpp | 7 +- src/diagram/CodObjCanvas.cpp | 11 +- src/diagram/CodSelfLinkCanvas.cpp | 28 +- src/diagram/ColDiagramView.cpp | 7 +- src/diagram/ColMsg.cpp | 145 +++++----- src/diagram/ColMsg.h | 6 +- src/diagram/ComponentCanvas.cpp | 32 +-- src/diagram/ComponentCanvas.h | 2 +- src/diagram/ComponentDiagramView.cpp | 29 +- src/diagram/ConstraintCanvas.cpp | 18 +- src/diagram/ConstraintCanvas.h | 2 +- src/diagram/DeploymentDiagramView.cpp | 28 +- src/diagram/DeploymentNodeCanvas.cpp | 15 +- src/diagram/DeploymentNodeCanvas.h | 2 +- src/diagram/DiagramCanvas.cpp | 75 ++--- src/diagram/DiagramItem.cpp | 71 ++--- src/diagram/DiagramItem.h | 12 +- src/diagram/DiagramView.cpp | 56 ++-- src/diagram/DiagramView.h | 6 +- src/diagram/ExpansionNodeCanvas.cpp | 11 +- src/diagram/ExpansionNodeCanvas.h | 2 +- src/diagram/ExpansionRegionCanvas.cpp | 11 +- src/diagram/ExpansionRegionCanvas.h | 2 +- src/diagram/FlowCanvas.cpp | 15 +- src/diagram/FlowCanvas.h | 2 +- src/diagram/FragmentCanvas.cpp | 69 ++--- src/diagram/FragmentCanvas.h | 8 +- src/diagram/InfoCanvas.cpp | 11 +- src/diagram/InfoCanvas.h | 2 +- .../InterruptibleActivityRegionCanvas.cpp | 11 +- .../InterruptibleActivityRegionCanvas.h | 2 +- src/diagram/NoteCanvas.cpp | 11 +- src/diagram/NoteCanvas.h | 2 +- src/diagram/ObjectDiagramView.cpp | 7 +- src/diagram/ObjectLinkCanvas.cpp | 2 +- src/diagram/OdClassInstCanvas.cpp | 43 +-- src/diagram/OdClassInstCanvas.h | 2 +- src/diagram/PackageCanvas.cpp | 17 +- src/diagram/PackageCanvas.h | 2 +- src/diagram/ParameterCanvas.cpp | 11 +- src/diagram/ParameterCanvas.h | 2 +- src/diagram/ParameterSetCanvas.cpp | 11 +- src/diagram/ParameterSetCanvas.h | 2 +- src/diagram/PinCanvas.cpp | 11 +- src/diagram/PinCanvas.h | 2 +- src/diagram/RelationCanvas.cpp | 13 +- src/diagram/SdClassInstCanvas.cpp | 25 +- src/diagram/SdClassInstCanvas.h | 2 +- src/diagram/SdContinuationCanvas.cpp | 11 +- src/diagram/SdContinuationCanvas.h | 2 +- src/diagram/SdDurationCanvas.cpp | 221 ++++++--------- src/diagram/SdDurationCanvas.h | 12 +- src/diagram/SdLifeLineCanvas.cpp | 78 ++---- src/diagram/SdLifeLineCanvas.h | 6 +- src/diagram/SdMsgCanvas.cpp | 15 +- src/diagram/SdMsgCanvas.h | 2 +- src/diagram/SdSelfMsgCanvas.cpp | 15 +- src/diagram/SdSelfMsgCanvas.h | 2 +- src/diagram/SeqDiagramView.cpp | 15 +- src/diagram/StateActionCanvas.cpp | 15 +- src/diagram/StateActionCanvas.h | 2 +- src/diagram/StateCanvas.cpp | 17 +- src/diagram/StateCanvas.h | 2 +- src/diagram/StateDiagramView.cpp | 7 +- src/diagram/StereotypePropertiesCanvas.cpp | 11 +- src/diagram/StereotypePropertiesCanvas.h | 2 +- src/diagram/SubjectCanvas.cpp | 17 +- src/diagram/SubjectCanvas.h | 2 +- src/diagram/TransitionCanvas.cpp | 17 +- src/diagram/TransitionCanvas.h | 2 +- src/diagram/UcClassCanvas.cpp | 24 +- src/diagram/UcClassCanvas.h | 2 +- src/diagram/UcUseCaseCanvas.cpp | 46 ++-- src/diagram/UcUseCaseCanvas.h | 2 +- src/diagram/UmlCanvas.cpp | 8 +- src/diagram/UseCaseDiagramView.cpp | 34 +-- src/dialog/ActivityActionDialog.cpp | 17 +- src/dialog/ActivityActionDialog.h | 10 +- src/dialog/ActivityDialog.cpp | 7 +- src/dialog/ActivityDialog.h | 2 +- src/dialog/ActivityObjectDialog.cpp | 5 +- src/dialog/ActivityObjectDialog.h | 2 +- src/dialog/ActivityPartitionDialog.cpp | 11 +- src/dialog/ActivityPartitionDialog.h | 2 +- src/dialog/ArtifactDialog.cpp | 11 +- src/dialog/ArtifactDialog.h | 2 +- src/dialog/AttributeDialog.cpp | 5 +- src/dialog/AttributeDialog.h | 2 +- src/dialog/BasicDialog.cpp | 5 +- src/dialog/BasicDialog.h | 2 +- src/dialog/BodyDialog.cpp | 2 +- src/dialog/BodyDialog.h | 4 +- src/dialog/BrowserSearchDialog.cpp | 8 +- src/dialog/ClassDialog.cpp | 98 +++---- src/dialog/ClassDialog.h | 2 +- src/dialog/ClassInstanceDialog.cpp | 18 +- src/dialog/ClassInstanceDialog.h | 2 +- src/dialog/ClassViewDialog.cpp | 7 +- src/dialog/ClassViewDialog.h | 2 +- src/dialog/CodAddMsgDialog.cpp | 9 +- src/dialog/ColMsgTable.cpp | 11 +- src/dialog/ComponentDialog.cpp | 14 +- src/dialog/ComponentDialog.h | 2 +- src/dialog/ConstraintDialog.cpp | 21 +- src/dialog/DialogUtil.cpp | 4 +- src/dialog/DialogUtil.h | 4 +- src/dialog/ExpansionRegionDialog.cpp | 5 +- src/dialog/ExpansionRegionDialog.h | 2 +- src/dialog/ExtraMemberDialog.cpp | 5 +- src/dialog/ExtraMemberDialog.h | 2 +- src/dialog/FlowDialog.cpp | 5 +- src/dialog/FlowDialog.h | 2 +- src/dialog/FragmentDialog.cpp | 7 +- src/dialog/HideShowDialog.cpp | 32 +-- src/dialog/InstanceDialog.cpp | 2 +- src/dialog/ObjectLinkDialog.cpp | 16 +- src/dialog/ObjectLinkDialog.h | 4 +- src/dialog/OperationDialog.cpp | 5 +- src/dialog/OperationDialog.h | 2 +- src/dialog/OperationListDialog.cpp | 4 +- src/dialog/OperationListDialog.h | 2 +- src/dialog/PackageDialog.cpp | 5 +- src/dialog/PackageDialog.h | 2 +- src/dialog/ParameterDialog.cpp | 5 +- src/dialog/ParameterDialog.h | 2 +- src/dialog/ParameterSetDialog.cpp | 5 +- src/dialog/ParameterSetDialog.h | 2 +- src/dialog/PinDialog.cpp | 5 +- src/dialog/PinDialog.h | 2 +- src/dialog/PseudoStateDialog.cpp | 7 +- src/dialog/PseudoStateDialog.h | 2 +- src/dialog/ReferenceDialog.cpp | 28 +- src/dialog/RelatedElementsDialog.cpp | 9 +- src/dialog/RelationDialog.cpp | 5 +- src/dialog/RelationDialog.h | 2 +- src/dialog/SimpleRelationDialog.cpp | 5 +- src/dialog/SimpleRelationDialog.h | 2 +- src/dialog/StateActionDialog.cpp | 5 +- src/dialog/StateActionDialog.h | 2 +- src/dialog/StateDialog.cpp | 23 +- src/dialog/StateDialog.h | 2 +- src/dialog/TransitionDialog.cpp | 5 +- src/dialog/TransitionDialog.h | 2 +- src/dialog/UseCaseDialog.cpp | 5 +- src/dialog/UseCaseDialog.h | 2 +- src/misc/Labeled.cpp | 4 +- src/misc/ProfiledStereotypes.cpp | 2 +- src/misc/myio.cpp | 1 - src/tool/ToolCom.cpp | 19 +- src/tool/ToolCom.h | 4 +- 354 files changed, 1849 insertions(+), 2427 deletions(-) diff --git a/src/CppGenerator/CppRefType.cpp b/src/CppGenerator/CppRefType.cpp index ff2496daa..03ad8f25e 100644 --- a/src/CppGenerator/CppRefType.cpp +++ b/src/CppGenerator/CppRefType.cpp @@ -39,7 +39,7 @@ #include // not in case of a dependency => external class in h -bool CppRefType::add(const UmlTypeSpec & t, Q3PtrList & l, +bool CppRefType::add(const UmlTypeSpec & t, QList & l, bool incl) { return (t.type) @@ -47,10 +47,9 @@ bool CppRefType::add(const UmlTypeSpec & t, Q3PtrList & l, : add(t.explicit_type, l, incl); } -bool CppRefType::add(UmlClass * cl, Q3PtrList & l, +bool CppRefType::add(UmlClass * cl, QList & l, bool incl, bool hight) { - CppRefType * ref; WrapperStr t = cl->name(); Weight w; @@ -69,7 +68,7 @@ bool CppRefType::add(UmlClass * cl, Q3PtrList & 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)) @@ -85,7 +84,7 @@ bool CppRefType::add(UmlClass * cl, Q3PtrList & l, return TRUE; } -bool CppRefType::add(const WrapperStr & t, Q3PtrList & l, bool incl) +bool CppRefType::add(const WrapperStr & t, QList & l, bool incl) { if (t.isEmpty()) return FALSE; @@ -108,10 +107,9 @@ bool CppRefType::add(const WrapperStr & t, Q3PtrList & 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; @@ -124,37 +122,38 @@ bool CppRefType::add(const WrapperStr & t, Q3PtrList & l, bool incl) return TRUE; } -void CppRefType::remove(const WrapperStr & t, Q3PtrList & l) +void CppRefType::remove(const WrapperStr & t, QList & l) { - Q3PtrListIterator it(l); + QMutableListIterator 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 & l) +void CppRefType::remove(UmlClass * cl, QList & l) { - Q3PtrListIterator it(l); + QMutableListIterator 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 & l) +void CppRefType::force_ref(UmlClass * cl, QList & 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) @@ -166,7 +165,7 @@ void CppRefType::force_ref(UmlClass * cl, Q3PtrList & l) } } -void CppRefType::compute(Q3PtrList & dependencies, +void CppRefType::compute(QList & dependencies, const WrapperStr & hdef, const WrapperStr & srcdef, WrapperStr & h_incl, WrapperStr & decl, WrapperStr & src_incl, UmlArtifact * who) @@ -199,10 +198,7 @@ void CppRefType::compute(Q3PtrList & 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); diff --git a/src/CppGenerator/CppRefType.h b/src/CppGenerator/CppRefType.h index 4f772436c..2c824207d 100644 --- a/src/CppGenerator/CppRefType.h +++ b/src/CppGenerator/CppRefType.h @@ -44,13 +44,13 @@ class CppRefType public: enum Weight { Low, Medium, High, Strong }; - static bool add(UmlClass *, Q3PtrList &, bool incl, bool hight = FALSE); - static bool add(const WrapperStr &, Q3PtrList &, bool incl); - static bool add(const UmlTypeSpec & t, Q3PtrList & l, bool incl); - static void remove(UmlClass *, Q3PtrList & l); - static void remove(const WrapperStr &, Q3PtrList & l); - static void force_ref(UmlClass * cl, Q3PtrList & l); - static void compute(Q3PtrList & dependencies, + static bool add(UmlClass *, QList &, bool incl, bool hight = FALSE); + static bool add(const WrapperStr &, QList &, bool incl); + static bool add(const UmlTypeSpec & t, QList & l, bool incl); + static void remove(UmlClass *, QList & l); + static void remove(const WrapperStr &, QList & l); + static void force_ref(UmlClass * cl, QList & l); + static void compute(QList & 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 c0fcf704e..4d26857c6 100644 --- a/src/CppGenerator/UmlArtifact.cpp +++ b/src/CppGenerator/UmlArtifact.cpp @@ -136,7 +136,7 @@ void UmlArtifact::generate() // compute dependencies bool all_in_h = (hdef.find("${all_includes}") != -1); - Q3PtrList dependencies; + QList dependencies; unsigned n = cls.count(); unsigned index; diff --git a/src/CppGenerator/UmlAttribute.cpp b/src/CppGenerator/UmlAttribute.cpp index cb34f3a49..140419289 100644 --- a/src/CppGenerator/UmlAttribute.cpp +++ b/src/CppGenerator/UmlAttribute.cpp @@ -40,7 +40,7 @@ #include "util.h" #include "misc/codec.h" -void UmlAttribute::compute_dependency(Q3PtrList & dependency, +void UmlAttribute::compute_dependency(QList & dependency, const WrapperStr & cl_stereotype, bool all_in_h) { diff --git a/src/CppGenerator/UmlAttribute.h b/src/CppGenerator/UmlAttribute.h index f425a870a..ea733f85c 100644 --- a/src/CppGenerator/UmlAttribute.h +++ b/src/CppGenerator/UmlAttribute.h @@ -42,7 +42,7 @@ class UmlAttribute : public UmlBaseAttribute UmlAttribute(void * id, const WrapperStr & n) : UmlBaseAttribute(id, n) {}; - virtual void compute_dependency(Q3PtrList & dependency, + virtual void compute_dependency(QList & 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..80b562ba3 100644 --- a/src/CppGenerator/UmlClass.cpp +++ b/src/CppGenerator/UmlClass.cpp @@ -51,7 +51,7 @@ // 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::context; +QList UmlClass::context; Q3ValueList UmlClass::noactuals; WrapperStr UmlClass::cpp_stereotype() @@ -84,7 +84,7 @@ void UmlClass::generate() } } -void UmlClass::compute_dependencies(Q3PtrList & dependencies, +void UmlClass::compute_dependencies(QList & dependencies, bool all_in_h) { const WrapperStr dummy; @@ -92,7 +92,7 @@ void UmlClass::compute_dependencies(Q3PtrList & dependencies, compute_dependency(dependencies, dummy, all_in_h); } -void UmlClass::compute_dependency(Q3PtrList & dependencies, +void UmlClass::compute_dependency(QList & dependencies, const WrapperStr &, bool all_in_h) { Q3PtrVector ch = children(); @@ -563,9 +563,9 @@ void UmlClass::write(QTextStream & f, const UmlTypeSpec & t, void UmlClass::write(QTextStream & f, bool with_formals, BooL * is_template, const Q3ValueList & 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 << "::"; diff --git a/src/CppGenerator/UmlClass.h b/src/CppGenerator/UmlClass.h index 699dadd1a..d507663c5 100644 --- a/src/CppGenerator/UmlClass.h +++ b/src/CppGenerator/UmlClass.h @@ -52,7 +52,7 @@ class UmlClass : public UmlBaseClass private: bool managed; - static Q3PtrList context; + static QList context; static Q3ValueList noactuals; @@ -62,9 +62,9 @@ class UmlClass : public UmlBaseClass WrapperStr cpp_stereotype(); - void compute_dependencies(Q3PtrList &, bool all_in_h); + void compute_dependencies(QList &, bool all_in_h); - virtual void compute_dependency(Q3PtrList & dependency, + virtual void compute_dependency(QList & dependency, const WrapperStr & cl_stereotype, bool all_in_h); virtual void generate_decl(aVisibility & current_visibility, diff --git a/src/CppGenerator/UmlClassItem.h b/src/CppGenerator/UmlClassItem.h index 76eb40457..12b5df8bf 100644 --- a/src/CppGenerator/UmlClassItem.h +++ b/src/CppGenerator/UmlClassItem.h @@ -47,7 +47,7 @@ class UmlClassItem : public UmlBaseClassItem : UmlBaseClassItem(id, n) { }; - virtual void compute_dependency(Q3PtrList & dependency, + virtual void compute_dependency(QList & dependency, const WrapperStr & cl_stereotype, bool all_in_h) = 0; diff --git a/src/CppGenerator/UmlClassMember.cpp b/src/CppGenerator/UmlClassMember.cpp index 4fb059d53..28a16fc9a 100644 --- a/src/CppGenerator/UmlClassMember.cpp +++ b/src/CppGenerator/UmlClassMember.cpp @@ -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 & dependencies, +bool UmlClassMember::compute_dependency(QList & dependencies, WrapperStr decl, const UmlTypeSpec & t, bool force_incl) { diff --git a/src/CppGenerator/UmlClassMember.h b/src/CppGenerator/UmlClassMember.h index 416f48103..bd5a5a25f 100644 --- a/src/CppGenerator/UmlClassMember.h +++ b/src/CppGenerator/UmlClassMember.h @@ -47,7 +47,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 & dependency, + static bool compute_dependency(QList & dependency, WrapperStr decl, const UmlTypeSpec &, bool force_incl = FALSE); diff --git a/src/CppGenerator/UmlExtraClassMember.cpp b/src/CppGenerator/UmlExtraClassMember.cpp index dbf96f6ce..68d62de47 100644 --- a/src/CppGenerator/UmlExtraClassMember.cpp +++ b/src/CppGenerator/UmlExtraClassMember.cpp @@ -35,7 +35,7 @@ #include "UmlExtraClassMember.h" #include "UmlClass.h" -void UmlExtraClassMember::compute_dependency(Q3PtrList &, +void UmlExtraClassMember::compute_dependency(QList &, const WrapperStr &, bool) { diff --git a/src/CppGenerator/UmlExtraClassMember.h b/src/CppGenerator/UmlExtraClassMember.h index 2c647079a..98d765026 100644 --- a/src/CppGenerator/UmlExtraClassMember.h +++ b/src/CppGenerator/UmlExtraClassMember.h @@ -46,7 +46,7 @@ class UmlExtraClassMember : public UmlBaseExtraClassMember UmlExtraClassMember(void * id, const WrapperStr & n) : UmlBaseExtraClassMember(id, n) {}; - virtual void compute_dependency(Q3PtrList & dependency, + virtual void compute_dependency(QList & dependency, const WrapperStr & cl_stereotype, bool all_in_h); virtual void generate_decl(aVisibility & current_visibility, diff --git a/src/CppGenerator/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp index dbb6b31ce..5704dd5f3 100644 --- a/src/CppGenerator/UmlOperation.cpp +++ b/src/CppGenerator/UmlOperation.cpp @@ -61,7 +61,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 & dependencies, +void UmlOperation::compute_dependency(QList & dependencies, const WrapperStr & cl_stereotype, bool all_in_h) { diff --git a/src/CppGenerator/UmlOperation.h b/src/CppGenerator/UmlOperation.h index 5c527f0f6..cc135dd63 100644 --- a/src/CppGenerator/UmlOperation.h +++ b/src/CppGenerator/UmlOperation.h @@ -47,7 +47,7 @@ class UmlOperation : public UmlBaseOperation UmlOperation(void * id, const WrapperStr & n) : UmlBaseOperation(id, n) {}; - virtual void compute_dependency(Q3PtrList & dependency, + virtual void compute_dependency(QList & dependency, const WrapperStr & cl_stereotype, bool all_in_h); virtual void generate_decl(aVisibility & current_visibility, QTextStream & f_h, diff --git a/src/CppGenerator/UmlRelation.cpp b/src/CppGenerator/UmlRelation.cpp index f8c175885..3418a8ced 100644 --- a/src/CppGenerator/UmlRelation.cpp +++ b/src/CppGenerator/UmlRelation.cpp @@ -41,7 +41,7 @@ #include "UmlCom.h" #include "util.h" -void UmlRelation::compute_dependency(Q3PtrList & dependencies, +void UmlRelation::compute_dependency(QList & dependencies, const WrapperStr & cl_stereotype, bool all_in_h) { diff --git a/src/CppGenerator/UmlRelation.h b/src/CppGenerator/UmlRelation.h index 646023842..3ab70ad20 100644 --- a/src/CppGenerator/UmlRelation.h +++ b/src/CppGenerator/UmlRelation.h @@ -46,7 +46,7 @@ class UmlRelation : public UmlBaseRelation : UmlBaseRelation(id, n) { }; - virtual void compute_dependency(Q3PtrList & dependency, + virtual void compute_dependency(QList & dependency, const WrapperStr & cl_stereotype, bool all_in_h); void generate_inherit(const char *& sep, QTextStream & f_h, diff --git a/src/CppReverse/BrowserNode.h b/src/CppReverse/BrowserNode.h index ead051dd0..69b25da25 100644 --- a/src/CppReverse/BrowserNode.h +++ b/src/CppReverse/BrowserNode.h @@ -71,7 +71,7 @@ class BrowserNode : public TreeItem #include -class BrowserNodeList : public Q3PtrList +class BrowserNodeList : public QList { 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..af6c64882 100644 --- a/src/CppReverse/Class.cpp +++ b/src/CppReverse/Class.cpp @@ -94,7 +94,7 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype, const Q3ValueList & tmplts, const WrapperStr & path, WrapperStr name #ifdef ROUNDTRIP - , bool rndtrp, Q3PtrList & expectedorder + , bool rndtrp, QList & expectedorder #endif ) { @@ -169,7 +169,7 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype, } bool roundtrip = FALSE; - Q3PtrList expected_order; + QList expected_order; #else UmlClass * cl_uml = 0; #endif @@ -571,7 +571,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 & expectedorder + , bool rndtrp, QList & expectedorder #endif ) { @@ -613,7 +613,7 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, ClassContainer * /*container*/, const WrapperStr & path #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -1135,7 +1135,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 & expectedorder + , bool rndtrp, QList & expectedorder #endif ) { @@ -1206,8 +1206,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 +1259,7 @@ Class * Class::reverse_enum(ClassContainer * container, expectedorder.append(cl_uml); bool roundtrip; - Q3PtrList expected_order; + QList expected_order; if (cl_uml->is_created()) { Statistic::one_class_created_more(); @@ -1481,7 +1482,7 @@ Class * Class::reverse_enum(ClassContainer * container, bool Class::reverse_typedef(ClassContainer * container, const WrapperStr & path, Q3ValueList & tmplts #ifdef ROUNDTRIP - , bool rndtrp, Q3PtrList & expectedorder + , bool rndtrp, QList & expectedorder #endif ) { diff --git a/src/CppReverse/Class.h b/src/CppReverse/Class.h index 465feee09..6c01f9b13 100644 --- a/src/CppReverse/Class.h +++ b/src/CppReverse/Class.h @@ -62,7 +62,7 @@ class Class : public BrowserNode, public ClassContainer void manage_member(WrapperStr s, aVisibility visibility, ClassContainer * container, const WrapperStr & path #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); @@ -87,7 +87,7 @@ class Class : public BrowserNode, public ClassContainer virtual void declaration(const WrapperStr & name, const WrapperStr & stereotype, const WrapperStr & decl #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); @@ -137,19 +137,19 @@ class Class : public BrowserNode, public ClassContainer const Q3ValueList & tmplt, const WrapperStr & path, WrapperStr name #ifdef ROUNDTRIP - , bool rndtrp, Q3PtrList & expectedorder + , bool rndtrp, QList & expectedorder #endif ); static Class * reverse_enum(ClassContainer * container, const WrapperStr & path, WrapperStr name #ifdef ROUNDTRIP - , bool rndtrp, Q3PtrList & expectedorder + , bool rndtrp, QList & expectedorder #endif ); static bool reverse_typedef(ClassContainer * container, const WrapperStr & path, Q3ValueList & tmplts #ifdef ROUNDTRIP - , bool rndtrp, Q3PtrList & expectedorder + , bool rndtrp, QList & expectedorder #endif ); }; diff --git a/src/CppReverse/ClassContainer.h b/src/CppReverse/ClassContainer.h index 34ca15464..5321bba1e 100644 --- a/src/CppReverse/ClassContainer.h +++ b/src/CppReverse/ClassContainer.h @@ -55,7 +55,7 @@ class ClassContainer virtual void declaration(const WrapperStr & name, const WrapperStr & stereotype, const WrapperStr & decl #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) = 0; diff --git a/src/CppReverse/Package.cpp b/src/CppReverse/Package.cpp index d03776dd1..ae468d748 100644 --- a/src/CppReverse/Package.cpp +++ b/src/CppReverse/Package.cpp @@ -68,7 +68,7 @@ QRegExp * Package::DirFilter; QRegExp * Package::FileFilter; // the packages selected by the user to reverse them -Q3PtrList Package::Choozen; +QList Package::Choozen; // all the classes presents in the environment, the // key is the full name including namespaces @@ -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(); } @@ -478,10 +474,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 +488,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); } @@ -613,9 +606,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 +622,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); } @@ -926,7 +915,7 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block) Lex::come_back(); // do not manage 'struct {..} var;' or 'struct {..} f()' ... #ifdef ROUNDTRIP - Q3PtrList dummy; + QList dummy; Class::reverse(this, s, Formals, f, 0, FALSE, dummy); #else @@ -948,7 +937,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 dummy; + QList dummy; Class::reverse_enum(this, f, 0, FALSE, dummy); #else @@ -958,7 +947,7 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block) } else if (s == "typedef") { #ifdef ROUNDTRIP - Q3PtrList dummy; + QList dummy; Class::reverse_typedef(this, f, Formals, FALSE, dummy); #else @@ -1393,7 +1382,7 @@ void Package::define(WrapperStr name, Class * cl) void Package::declaration(const WrapperStr &, const WrapperStr &, const WrapperStr & #ifdef ROUNDTRIP - , bool, Q3PtrList & + , bool, QList & #endif ) { @@ -1470,9 +1459,7 @@ 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; diff --git a/src/CppReverse/Package.h b/src/CppReverse/Package.h index 603d10827..d8d6e0d63 100644 --- a/src/CppReverse/Package.h +++ b/src/CppReverse/Package.h @@ -73,7 +73,7 @@ class Package : public BrowserNode, public ClassContainer virtual void declaration(const WrapperStr & name, const WrapperStr & stereotype, const WrapperStr & decl #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); @@ -129,7 +129,7 @@ class Package : public BrowserNode, public ClassContainer WrapperStr src_path; // empty or finish by a / static QApplication * app; - static Q3PtrList Choozen; /* List of chosen "packages" to reverse */ + static QList Choozen; /* List of chosen "packages" to reverse */ static int Nfiles; static bool Scan; static Package * Root; @@ -137,7 +137,7 @@ class Package : public BrowserNode, public ClassContainer static QRegExp * FileFilter; //static Package * Unknown; static Q3ValueList Formals; - static Q3PtrList UsedClasses; + static QList UsedClasses; static NDict Declared; static NDict Defined; diff --git a/src/CppReverse/TreeItem.h b/src/CppReverse/TreeItem.h index d9b34dd79..117e9a426 100644 --- a/src/CppReverse/TreeItem.h +++ b/src/CppReverse/TreeItem.h @@ -39,14 +39,14 @@ #else -#include #include +#include class TreeItem { private: TreeItem * its_parent; - Q3PtrList its_children; + QList its_children; QString its_name; public: @@ -62,12 +62,10 @@ class TreeItem return its_parent; }; - TreeItem * firstChild() { - return its_children.first(); - }; - TreeItem * nextSibling() { - return its_parent->its_children.next(); - }; + const QList &children() + { + return its_children; + } }; #endif diff --git a/src/CppReverse/UmlArtifact.cpp b/src/CppReverse/UmlArtifact.cpp index 862aa4b79..a821be18b 100644 --- a/src/CppReverse/UmlArtifact.cpp +++ b/src/CppReverse/UmlArtifact.cpp @@ -92,7 +92,7 @@ UmlArtifact * UmlArtifact::get_main() return main_art; } -void UmlArtifact::mark_useless(Q3PtrList & l) +void UmlArtifact::mark_useless(QList & l) { if (useless) { set_isMarked(TRUE); diff --git a/src/CppReverse/UmlArtifact.h b/src/CppReverse/UmlArtifact.h index e9bf0c217..cfb41ca69 100644 --- a/src/CppReverse/UmlArtifact.h +++ b/src/CppReverse/UmlArtifact.h @@ -66,7 +66,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 & l); + virtual void mark_useless(QList & 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 357196cb1..97988c5ee 100644 --- a/src/CppReverse/UmlAttribute.cpp +++ b/src/CppReverse/UmlAttribute.cpp @@ -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 & expected_order + , bool roundtrip, QList & expected_order #endif ) { diff --git a/src/CppReverse/UmlAttribute.h b/src/CppReverse/UmlAttribute.h index 83f1a5dac..94572c7a4 100644 --- a/src/CppReverse/UmlAttribute.h +++ b/src/CppReverse/UmlAttribute.h @@ -49,7 +49,7 @@ class UmlAttribute : public UmlBaseAttribute const WrapperStr & value, WrapperStr comment, WrapperStr description #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); #ifdef ROUNDTRIP diff --git a/src/CppReverse/UmlClass.cpp b/src/CppReverse/UmlClass.cpp index bd744295b..4cb641bc7 100644 --- a/src/CppReverse/UmlClass.cpp +++ b/src/CppReverse/UmlClass.cpp @@ -59,7 +59,7 @@ using namespace std; // contains the classes whose definition in currently read // may be more than one because of the nested classes -Q3PtrList UmlClass::UnderConstruction; +QList UmlClass::UnderConstruction; // used (by using) classes list Q3Dict UmlClass::Usings; @@ -79,8 +79,8 @@ bool UmlClass::manage_inherit(ClassContainer * container, #ifdef REVERSE , bool libp # ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order - , bool container_roundtrip, Q3PtrList & container_expected_order + , bool roundtrip, QList & expected_order + , bool container_roundtrip, QList & container_expected_order # endif #endif ) @@ -291,7 +291,7 @@ UmlClass * UmlClass::auxilarily_typedef(const WrapperStr & base , bool libp # ifdef ROUNDTRIP , bool container_roundtrip - , Q3PtrList & container_expected_order + , QList & container_expected_order # endif #endif ) @@ -467,12 +467,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) @@ -641,7 +641,7 @@ bool UmlClass::set_roundtrip_expected() } -void UmlClass::mark_useless(Q3PtrList & l) +void UmlClass::mark_useless(QList & l) { UmlClassItem::mark_useless(l); @@ -733,7 +733,7 @@ UmlRelation * UmlClass::search_for_inherit(UmlClass * mother) return 0; } -void UmlClass::reorder(Q3PtrList & expected_order) +void UmlClass::reorder(QList & expected_order) { if (expected_order.isEmpty()) return; @@ -745,10 +745,8 @@ void UmlClass::reorder(Q3PtrList & expected_order) //bool updated = FALSE; UmlItem * expected_previous = 0; - Q3PtrListIterator 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 +763,6 @@ void UmlClass::reorder(Q3PtrList & expected_order) } expected_previous = expected; - ++expected_it; v += 1; } diff --git a/src/CppReverse/UmlClass.h b/src/CppReverse/UmlClass.h index 3c1b160a3..c6f559bca 100644 --- a/src/CppReverse/UmlClass.h +++ b/src/CppReverse/UmlClass.h @@ -60,8 +60,8 @@ class UmlClass : public UmlBaseClass #ifdef REVERSE , bool libp # ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order - , bool container_roundtrip, Q3PtrList & container_expected_order + , bool roundtrip, QList & expected_order + , bool container_roundtrip, QList & container_expected_order # endif #endif ); @@ -97,7 +97,7 @@ class UmlClass : public UmlBaseClass # ifdef ROUNDTRIP virtual void upload(ClassContainer * cnt); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & l); virtual void scan_it(int & n); virtual void send_it(int n); bool is_created() const { @@ -112,7 +112,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 & expected_order); + void reorder(QList & expected_order); # endif #endif @@ -122,12 +122,12 @@ class UmlClass : public UmlBaseClass , bool libp # ifdef ROUNDTRIP , bool container_roundtrip - , Q3PtrList & container_expected_order + , QList & container_expected_order # endif #endif ); - static Q3PtrList UnderConstruction; + static QList UnderConstruction; static Q3Dict Usings; static Q3ValueList > UsingScope; }; diff --git a/src/CppReverse/UmlClassItem.cpp b/src/CppReverse/UmlClassItem.cpp index 95672043a..3bf98a5b8 100644 --- a/src/CppReverse/UmlClassItem.cpp +++ b/src/CppReverse/UmlClassItem.cpp @@ -41,7 +41,7 @@ bool UmlClassItem::set_roundtrip_expected() return isWritable(); } -void UmlClassItem::mark_useless(Q3PtrList & l) +void UmlClassItem::mark_useless(QList & l) { if (is_useless()) { set_isMarked(TRUE); diff --git a/src/CppReverse/UmlClassItem.h b/src/CppReverse/UmlClassItem.h index a55961d61..f0962c878 100644 --- a/src/CppReverse/UmlClassItem.h +++ b/src/CppReverse/UmlClassItem.h @@ -64,7 +64,7 @@ class UmlClassItem : public UmlBaseClassItem useless = !y; } virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & l); # endif #endif }; diff --git a/src/CppReverse/UmlClassView.cpp b/src/CppReverse/UmlClassView.cpp index f8a538455..b3c314d72 100644 --- a/src/CppReverse/UmlClassView.cpp +++ b/src/CppReverse/UmlClassView.cpp @@ -61,7 +61,7 @@ bool UmlClassView::set_roundtrip_expected() return result; } -void UmlClassView::mark_useless(Q3PtrList & l) +void UmlClassView::mark_useless(QList & l) { Q3PtrVector ch = UmlItem::children(); UmlClassItem ** v = (UmlClassItem **) ch.data(); diff --git a/src/CppReverse/UmlClassView.h b/src/CppReverse/UmlClassView.h index ca5f2b09f..2620dc4b1 100644 --- a/src/CppReverse/UmlClassView.h +++ b/src/CppReverse/UmlClassView.h @@ -42,7 +42,7 @@ class UmlClassView : public UmlBaseClassView #ifdef ROUNDTRIP virtual void upload(ClassContainer *); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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..a73f47090 100644 --- a/src/CppReverse/UmlDeploymentView.cpp +++ b/src/CppReverse/UmlDeploymentView.cpp @@ -35,7 +35,7 @@ //Added by qt3to4: #include -static Q3PtrList Artifacts; +static QList Artifacts; bool UmlDeploymentView::set_roundtrip_expected() { @@ -50,7 +50,7 @@ bool UmlDeploymentView::set_roundtrip_expected() return result; } -void UmlDeploymentView::mark_useless(Q3PtrList & l) +void UmlDeploymentView::mark_useless(QList & l) { Q3PtrVector ch = UmlItem::children(); UmlClassItem ** v = (UmlClassItem **) ch.data(); @@ -80,15 +80,13 @@ void UmlDeploymentView::scan_it(int & n) if (n != 0) { Package::set_step(1, n); - Q3PtrListIterator 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 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..3f30c1dd7 100644 --- a/src/CppReverse/UmlDeploymentView.h +++ b/src/CppReverse/UmlDeploymentView.h @@ -44,7 +44,7 @@ class UmlDeploymentView : public UmlBaseDeploymentView #ifdef ROUNDTRIP virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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..a246ae4f9 100644 --- a/src/CppReverse/UmlItem.cpp +++ b/src/CppReverse/UmlItem.cpp @@ -47,7 +47,7 @@ bool UmlItem::set_roundtrip_expected() return TRUE; } -void UmlItem::mark_useless(Q3PtrList &) +void UmlItem::mark_useless(QList &) { // does nothing } diff --git a/src/CppReverse/UmlItem.h b/src/CppReverse/UmlItem.h index fedd007fc..eb38bef0e 100644 --- a/src/CppReverse/UmlItem.h +++ b/src/CppReverse/UmlItem.h @@ -50,7 +50,7 @@ class UmlItem : public UmlBaseItem #ifdef ROUNDTRIP virtual void upload(ClassContainer *); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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 731a6f89b..898c3c49e 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -55,7 +55,7 @@ using namespace std; # endif #endif -NDict< Q3PtrList > UmlOperation::friends; +NDict< QList > UmlOperation::friends; #ifdef ROUNDTRIP Q3PtrDict UmlOperation::DefNotYetSet(97); #endif @@ -224,7 +224,7 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name, bool friendp, WrapperStr friend_template, WrapperStr comment, WrapperStr description, bool pfunc #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -473,10 +473,10 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name, if ((op != 0) && friendp) { // not an operation - Q3PtrList * fr = friends[name]; + QList * fr = friends[name]; if (fr == 0) { - fr = new Q3PtrList; + fr = new QList; fr->append(op); friends.insert(name, fr); } @@ -1189,21 +1189,20 @@ bool UmlOperation::read_throw_elt(ClassContainer * container, return FALSE; } -void UmlOperation::friend_operations(Q3PtrList & candidates, +void UmlOperation::friend_operations(QList & candidates, const Q3ValueList & tmplts, const WrapperStr & name) { - Q3PtrList * fr = friends[name]; + QList * fr = friends[name]; if (fr != 0) { // may be a friend operation FormalParameterList t; const FormalParameterList & tmpl = (tmplts.isEmpty()) ? t : tmplts.last(); - Q3PtrListIterator 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(); @@ -1217,10 +1216,8 @@ void UmlOperation::friend_operations(Q3PtrList & candidates, if (rank == ~0u) // candidate - candidates.append(it.current()); + candidates.append(op); } - - ++it; } } } @@ -1255,7 +1252,7 @@ static bool compare_templates(const FormalParameterList & t1, return TRUE; } -bool UmlOperation::operations(Q3PtrList & candidates, UmlClass * cl, +bool UmlOperation::operations(QList & candidates, UmlClass * cl, const Q3ValueList & tmplts, const FormalParameterList *& oper_tmplt, const WrapperStr & name) @@ -1466,7 +1463,7 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name, } } - Q3PtrList candidates; + QList candidates; const FormalParameterList * oper_tmplt; if ((tcl.type != 0) || // set in case of a contructor/destructor @@ -1491,20 +1488,19 @@ void UmlOperation::reverse_definition(Package * pack, WrapperStr name, return; } - Q3PtrListIterator 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() == (int)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, + if (op->reverse_if_def(pack, tmplts, oper_tmplt, inlinep, pfct, comment, description, on_error, nargs, name)) { cl->set_under_construction(FALSE, TRUE); @@ -1514,9 +1510,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); @@ -1537,12 +1533,9 @@ bool UmlOperation::reverse_if_def(Package * pack, UmlParameter param; Q3ValueList params = this->params(); - Q3PtrList param_names; WrapperStr decl = "${(}${)}"; unsigned rank = 0; - param_names.setAutoDelete(TRUE); - while (read_param(pack /*yes !*/, rank, param, decl, tmplts, on_error, FALSE)) { if ((params.count() <= (int)rank) || (params[rank].dir != param.dir) || @@ -2156,7 +2149,7 @@ UmlOperation * UmlOperation::already_exist(Class * container, const Q3PtrVector & ch = container->get_uml()->UmlItem::children(); UmlItem ** v = ch.data(); UmlItem ** const vsup = v + ch.size(); - Q3PtrList opers; + QList opers; for (; v != vsup; v += 1) if (((*v)->kind() == anOperation) && @@ -2172,17 +2165,16 @@ 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 same_names; + QList same_names; // search for operation having the same params name and number - for (op = opers.first(); op != 0; op = opers.next()) { + foreach (UmlOperation *op, opers) { Q3ValueList ps = op->params(); Q3ValueList::ConstIterator it1; Q3ValueList::ConstIterator it2; @@ -2219,7 +2211,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 diff --git a/src/CppReverse/UmlOperation.h b/src/CppReverse/UmlOperation.h index 61aa23cf0..fcab2910c 100644 --- a/src/CppReverse/UmlOperation.h +++ b/src/CppReverse/UmlOperation.h @@ -55,7 +55,7 @@ class UmlOperation : public UmlBaseOperation bool friendp, WrapperStr friend_template, WrapperStr comment, WrapperStr description, bool pfunc #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); static void reverse_definition(Package * pack, WrapperStr name, WrapperStr type, @@ -78,7 +78,7 @@ class UmlOperation : public UmlBaseOperation #ifdef ROUNDTRIP static Q3PtrDict DefNotYetSet; #endif - static NDict< Q3PtrList > friends; + static NDict< QList > friends; FormalParameterList * formals; WrapperStr def0; // for template operations @@ -86,10 +86,10 @@ class UmlOperation : public UmlBaseOperation UmlParameter & param, WrapperStr & decl, const Q3ValueList & tmplt, BooL & on_error, bool add_defaultvalue); - static void friend_operations(Q3PtrList & candidates, + static void friend_operations(QList & candidates, const Q3ValueList & tmplt, const WrapperStr & name); - static bool operations(Q3PtrList & candidates, UmlClass * cl, + static bool operations(QList & candidates, UmlClass * cl, const Q3ValueList & tmplt, const FormalParameterList *& oper_tmplt, const WrapperStr & name); diff --git a/src/CppReverse/UmlPackage.cpp b/src/CppReverse/UmlPackage.cpp index d5902d6fd..63ed90a85 100644 --- a/src/CppReverse/UmlPackage.cpp +++ b/src/CppReverse/UmlPackage.cpp @@ -341,7 +341,7 @@ bool UmlPackage::set_roundtrip_expected() return result; } -void UmlPackage::mark_useless(Q3PtrList & l) +void UmlPackage::mark_useless(QList & l) { Q3PtrVector ch = UmlItem::children(); UmlClassItem ** v = (UmlClassItem **) ch.data(); diff --git a/src/CppReverse/UmlPackage.h b/src/CppReverse/UmlPackage.h index cd3da1216..6d21a6aa4 100644 --- a/src/CppReverse/UmlPackage.h +++ b/src/CppReverse/UmlPackage.h @@ -55,7 +55,7 @@ class UmlPackage : public UmlBasePackage void init(Package *); virtual void upload(ClassContainer *); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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..d624cbc60 100644 --- a/src/CppReverse/UmlRelation.cpp +++ b/src/CppReverse/UmlRelation.cpp @@ -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 & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -356,7 +356,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name, #ifdef ROUNDTRIP bool UmlRelation::new_friend(Class * container, UmlClass * to, - Q3PtrList & expected_order) + QList & expected_order) { UmlClass * from = container->get_uml(); diff --git a/src/CppReverse/UmlRelation.h b/src/CppReverse/UmlRelation.h index 265a4311d..073294b93 100644 --- a/src/CppReverse/UmlRelation.h +++ b/src/CppReverse/UmlRelation.h @@ -50,7 +50,7 @@ class UmlRelation : public UmlBaseRelation const WrapperStr & value, WrapperStr comment, WrapperStr description #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); static bool new_friend(UmlClass * from, UmlClass * to); @@ -58,7 +58,7 @@ class UmlRelation : public UmlBaseRelation #ifdef ROUNDTRIP void set_unidir(); static bool new_friend(Class * from, UmlClass * to, - Q3PtrList & expected_order); + QList & expected_order); #endif }; diff --git a/src/CppRoundtrip/main.cpp b/src/CppRoundtrip/main.cpp index f01467ec4..925064c0e 100644 --- a/src/CppRoundtrip/main.cpp +++ b/src/CppRoundtrip/main.cpp @@ -139,7 +139,7 @@ int main(int argc, char ** argv) (*v)->set_isMarked(FALSE); } - Q3PtrList useless; + QList useless; item->mark_useless(useless); @@ -150,13 +150,10 @@ int main(int argc, char ** argv) "Delete them ?", "Yes", "No", QString(), 1, 1) == 0)) { - Q3PtrListIterator 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/IdlGenerator/UmlArtifact.cpp b/src/IdlGenerator/UmlArtifact.cpp index 801d95e22..9a8829643 100644 --- a/src/IdlGenerator/UmlArtifact.cpp +++ b/src/IdlGenerator/UmlArtifact.cpp @@ -101,7 +101,7 @@ void UmlArtifact::generate() #if 0 // compute dependencies - Q3PtrList dependencies; + QList dependencies; #endif const Q3PtrVector & cls = associatedClasses(); unsigned n = cls.count(); diff --git a/src/JavaCat/BrowserNode.cpp b/src/JavaCat/BrowserNode.cpp index dd84e8bb4..bf3a42f8c 100644 --- a/src/JavaCat/BrowserNode.cpp +++ b/src/JavaCat/BrowserNode.cpp @@ -83,8 +83,12 @@ void BrowserNodeList::search(BrowserNode * bn, int k, } } -int BrowserNodeList::compareItems(Q3PtrCollection::Item item1, Q3PtrCollection::Item item2) +bool BrowserNodeList::lessThan(BrowserNode *a, BrowserNode *b) { - return ((BrowserNode *) item1)->text(0) - .compare(((BrowserNode *) item2)->text(0)); + return a->text(0) < b->text(0); +} + +void BrowserNodeList::sort() +{ + qSort(begin(), end(), lessThan); } diff --git a/src/JavaCat/BrowserNode.h b/src/JavaCat/BrowserNode.h index bda314b66..23d23e57a 100644 --- a/src/JavaCat/BrowserNode.h +++ b/src/JavaCat/BrowserNode.h @@ -75,11 +75,12 @@ class BrowserNode : public TreeItem #include -class BrowserNodeList : public Q3PtrList +class BrowserNodeList : public QList { 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..c63c7b554 100644 --- a/src/JavaCat/BrowserSearchDialog.cpp +++ b/src/JavaCat/BrowserSearchDialog.cpp @@ -131,9 +131,7 @@ void BrowserSearchDialog::search() ed->text(), 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()) diff --git a/src/JavaCat/Class.cpp b/src/JavaCat/Class.cpp index 73148caa0..cec31f836 100644 --- a/src/JavaCat/Class.cpp +++ b/src/JavaCat/Class.cpp @@ -63,7 +63,39 @@ UmlArtifact * Class::CurrentArtifact; #include "Pixmap.h" #include "ShowFileDialog.h" -Q3PtrList 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) @@ -368,7 +400,7 @@ bool Class::reverse(ClassContainer * container, WrapperStr stereotype, aVisibility visibility, WrapperStr & path, Q3ValueList tmplts #ifdef ROUNDTRIP - , bool rndtrp, Q3PtrList & expectedorder + , bool rndtrp, QList & expectedorder #endif ) { @@ -406,7 +438,7 @@ bool Class::reverse(ClassContainer * container, WrapperStr stereotype, } bool roundtrip = FALSE; - Q3PtrList expected_order; + QList expected_order; #else UmlClass * cl_uml = 0; #endif @@ -706,7 +738,7 @@ bool Class::reverse(ClassContainer * container, WrapperStr stereotype, bool Class::manage_extends(ClassContainer * container, const Q3ValueList & tmplts #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -747,7 +779,7 @@ bool Class::manage_extends(ClassContainer * container, bool Class::manage_implements(ClassContainer * container, aRelationKind k, const Q3ValueList & tmplts #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -804,7 +836,7 @@ bool Class::add_inherit(aRelationKind k, UmlTypeSpec & typespec, Q3ValueList & actuals, WrapperStr & str_actuals #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -1085,7 +1117,7 @@ bool Class::get_formals(FormalParameterList & tmplt, bool name_only, bool Class::manage_member(WrapperStr s, WrapperStr & path #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -1415,7 +1447,7 @@ bool Class::manage_member(WrapperStr s, WrapperStr & path bool Class::manage_enum_items( #ifdef ROUNDTRIP - bool roundtrip, Q3PtrList & expected_order + bool roundtrip, QList & expected_order #endif ) { @@ -1613,10 +1645,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 @@ -1743,13 +1772,13 @@ 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()); } diff --git a/src/JavaCat/Class.h b/src/JavaCat/Class.h index c55c0c493..d563d72af 100644 --- a/src/JavaCat/Class.h +++ b/src/JavaCat/Class.h @@ -46,6 +46,20 @@ class QPainter; class QColorGroup; #endif +class Class; + +class HistoricList +{ + QList 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: @@ -66,7 +80,7 @@ class Class : public BrowserNode, public ClassContainer bool description_updatedp; WrapperStr description; - static Q3PtrList Historic; + static HistoricList Historic; #endif FormalParameterList formals; @@ -75,31 +89,31 @@ class Class : public BrowserNode, public ClassContainer bool manage_extends(ClassContainer * container, const Q3ValueList & tmplts #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); bool manage_implements(ClassContainer * container, aRelationKind k, const Q3ValueList & tmplts #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); bool add_inherit(aRelationKind k, UmlTypeSpec & typespec, Q3ValueList & actuals, WrapperStr & str_actual #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & 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 & expected_order + , bool roundtrip, QList & expected_order #endif ); bool manage_enum_items( #ifdef ROUNDTRIP - bool roundtrip, Q3PtrList & expected_order + bool roundtrip, QList & expected_order #endif ); void set_description(const char * p); @@ -174,7 +188,7 @@ class Class : public BrowserNode, public ClassContainer aVisibility visibility, WrapperStr & f, Q3ValueList tmplts #ifdef ROUNDTRIP - , bool rndtrp, Q3PtrList & expectedorder + , bool rndtrp, QList & expectedorder #endif ); diff --git a/src/JavaCat/Package.cpp b/src/JavaCat/Package.cpp index ce1690913..9ff123bdf 100644 --- a/src/JavaCat/Package.cpp +++ b/src/JavaCat/Package.cpp @@ -325,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(); @@ -351,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(); } @@ -539,9 +535,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(); } @@ -811,7 +805,7 @@ void Package::reverse_file(WrapperStr f if ((s == "class") || (s == "enum") || (s == "interface") || (s == "@interface")) { #ifdef ROUNDTRIP - Q3PtrList dummy; + QList dummy; #endif if (!Class::reverse(this, s, annotation, abstractp, @@ -1251,9 +1245,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 (TreeItem *child = firstChild(); child; child = child->nextSibling()) { +#endif if (((BrowserNode *) child)->isa_package() && (child->text(0) == (const char *) name)) { p = (Package *) child; diff --git a/src/JavaCat/TreeItem.h b/src/JavaCat/TreeItem.h index 1680fc3a8..c7eedfe82 100644 --- a/src/JavaCat/TreeItem.h +++ b/src/JavaCat/TreeItem.h @@ -39,14 +39,14 @@ #else -#include -#include +#include +#include class TreeItem { private: TreeItem * its_parent; - Q3PtrList its_children; + QList its_children; QString its_name; // java_classes share it in case of a java classes 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 &children() const { + return its_children; + } }; #endif diff --git a/src/JavaCat/UmlArtifact.cpp b/src/JavaCat/UmlArtifact.cpp index e1c427ec5..80793da59 100644 --- a/src/JavaCat/UmlArtifact.cpp +++ b/src/JavaCat/UmlArtifact.cpp @@ -82,7 +82,7 @@ bool UmlArtifact::is_roundtrip_usefull() return has_roundtrip_expected; } -void UmlArtifact::mark_useless(Q3PtrList & l) +void UmlArtifact::mark_useless(QList & l) { if (useless) { set_isMarked(TRUE); diff --git a/src/JavaCat/UmlArtifact.h b/src/JavaCat/UmlArtifact.h index 061bfbe2a..8bbb8f68f 100644 --- a/src/JavaCat/UmlArtifact.h +++ b/src/JavaCat/UmlArtifact.h @@ -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 & l); + virtual void mark_useless(QList & 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 52e82250b..c641de2dd 100644 --- a/src/JavaCat/UmlAttribute.cpp +++ b/src/JavaCat/UmlAttribute.cpp @@ -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 & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -341,7 +341,7 @@ bool UmlAttribute::new_one(Class * container, const WrapperStr & name, bool UmlAttribute::manage_enum_item(WrapperStr name, UmlClass * cl #ifdef ROUNDTRIP , bool roundtrip, - Q3PtrList & expected_order + QList & expected_order #endif ) { diff --git a/src/JavaCat/UmlAttribute.h b/src/JavaCat/UmlAttribute.h index badd0e54d..cf8387ceb 100644 --- a/src/JavaCat/UmlAttribute.h +++ b/src/JavaCat/UmlAttribute.h @@ -48,14 +48,14 @@ class UmlAttribute : public UmlBaseAttribute const WrapperStr & value, WrapperStr comment, WrapperStr description, WrapperStr annotation #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); static bool manage_enum_item(WrapperStr s, UmlClass * cl #ifdef ROUNDTRIP , bool roundtrip, - Q3PtrList & expected_order + QList & expected_order #endif ); }; diff --git a/src/JavaCat/UmlClass.cpp b/src/JavaCat/UmlClass.cpp index bfb65b19f..cd2b016ea 100644 --- a/src/JavaCat/UmlClass.cpp +++ b/src/JavaCat/UmlClass.cpp @@ -145,7 +145,7 @@ bool UmlClass::set_roundtrip_expected() } -void UmlClass::mark_useless(Q3PtrList & l) +void UmlClass::mark_useless(QList & l) { UmlClassItem::mark_useless(l); @@ -197,7 +197,7 @@ UmlItem * UmlClass::search_for_att_rel(const WrapperStr & name) return 0; } -void UmlClass::reorder(Q3PtrList & expected_order) +void UmlClass::reorder(QList & expected_order) { if (expected_order.isEmpty()) return; @@ -209,10 +209,8 @@ void UmlClass::reorder(Q3PtrList & expected_order) //bool updated = FALSE; UmlItem * expected_previous = 0; - Q3PtrListIterator 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 & expected_order) } expected_previous = expected; - ++expected_it; v += 1; } diff --git a/src/JavaCat/UmlClass.h b/src/JavaCat/UmlClass.h index 7c843827e..835429419 100644 --- a/src/JavaCat/UmlClass.h +++ b/src/JavaCat/UmlClass.h @@ -60,7 +60,7 @@ class UmlClass : public UmlBaseClass # ifdef ROUNDTRIP virtual void upload(ClassContainer * cnt); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & l); virtual void scan_it(int & n); virtual void send_it(int n); bool is_created() const { @@ -73,7 +73,7 @@ class UmlClass : public UmlBaseClass return the_class; } UmlItem * search_for_att_rel(const WrapperStr & name); - void reorder(Q3PtrList & expected_order); + void reorder(QList & 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..c54e7ddb6 100644 --- a/src/JavaCat/UmlClassItem.cpp +++ b/src/JavaCat/UmlClassItem.cpp @@ -41,7 +41,7 @@ bool UmlClassItem::set_roundtrip_expected() return isWritable(); } -void UmlClassItem::mark_useless(Q3PtrList & l) +void UmlClassItem::mark_useless(QList & l) { if (is_useless()) { set_isMarked(TRUE); diff --git a/src/JavaCat/UmlClassItem.h b/src/JavaCat/UmlClassItem.h index 5515bfada..8f8a9ad27 100644 --- a/src/JavaCat/UmlClassItem.h +++ b/src/JavaCat/UmlClassItem.h @@ -61,7 +61,7 @@ class UmlClassItem : public UmlBaseClassItem useless = !y; } virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & l); #endif }; diff --git a/src/JavaCat/UmlClassView.cpp b/src/JavaCat/UmlClassView.cpp index e4eb30065..918187b2c 100644 --- a/src/JavaCat/UmlClassView.cpp +++ b/src/JavaCat/UmlClassView.cpp @@ -62,7 +62,7 @@ bool UmlClassView::set_roundtrip_expected() return result; } -void UmlClassView::mark_useless(Q3PtrList & l) +void UmlClassView::mark_useless(QList & l) { Q3PtrVector ch = UmlItem::children(); UmlClassItem ** v = (UmlClassItem **) ch.data(); diff --git a/src/JavaCat/UmlClassView.h b/src/JavaCat/UmlClassView.h index 1d79daf84..7d41b8154 100644 --- a/src/JavaCat/UmlClassView.h +++ b/src/JavaCat/UmlClassView.h @@ -44,7 +44,7 @@ class UmlClassView : public UmlBaseClassView #ifdef ROUNDTRIP virtual void upload(ClassContainer *); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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..7eec47ce0 100644 --- a/src/JavaCat/UmlDeploymentView.cpp +++ b/src/JavaCat/UmlDeploymentView.cpp @@ -34,7 +34,7 @@ //Added by qt3to4: #include -static Q3PtrList Artifacts; +static QList Artifacts; bool UmlDeploymentView::set_roundtrip_expected() { @@ -49,7 +49,7 @@ bool UmlDeploymentView::set_roundtrip_expected() return result; } -void UmlDeploymentView::mark_useless(Q3PtrList & l) +void UmlDeploymentView::mark_useless(QList & l) { Q3PtrVector ch = UmlItem::children(); UmlClassItem ** v = (UmlClassItem **) ch.data(); @@ -79,15 +79,11 @@ void UmlDeploymentView::scan_it(int & n) if (n != 0) { Package::set_step(1, n); - Q3PtrListIterator 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 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..4e1f55e23 100644 --- a/src/JavaCat/UmlDeploymentView.h +++ b/src/JavaCat/UmlDeploymentView.h @@ -44,7 +44,7 @@ class UmlDeploymentView : public UmlBaseDeploymentView #ifdef ROUNDTRIP virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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 f933ef494..9393cf2ef 100644 --- a/src/JavaCat/UmlExtraClassMember.cpp +++ b/src/JavaCat/UmlExtraClassMember.cpp @@ -42,7 +42,7 @@ //} void UmlExtraClassMember::add_init(UmlClass * cl, WrapperStr def, bool roundtrip, - Q3PtrList & expected_order) + QList & expected_order) { if (roundtrip) { const Q3PtrVector & ch = cl->children(); diff --git a/src/JavaCat/UmlExtraClassMember.h b/src/JavaCat/UmlExtraClassMember.h index 68823ab54..ffeab7e35 100644 --- a/src/JavaCat/UmlExtraClassMember.h +++ b/src/JavaCat/UmlExtraClassMember.h @@ -51,7 +51,7 @@ class UmlExtraClassMember : public UmlBaseExtraClassMember #ifdef ROUNDTRIP static void add_init(UmlClass * cl, WrapperStr def, bool roundtrip, - Q3PtrList & expected_order); + QList & expected_order); #endif }; diff --git a/src/JavaCat/UmlItem.cpp b/src/JavaCat/UmlItem.cpp index 42856a55a..e139ca053 100644 --- a/src/JavaCat/UmlItem.cpp +++ b/src/JavaCat/UmlItem.cpp @@ -46,7 +46,7 @@ bool UmlItem::set_roundtrip_expected() return TRUE; } -void UmlItem::mark_useless(Q3PtrList &) +void UmlItem::mark_useless(QList &) { // does nothing } diff --git a/src/JavaCat/UmlItem.h b/src/JavaCat/UmlItem.h index fedd007fc..eb38bef0e 100644 --- a/src/JavaCat/UmlItem.h +++ b/src/JavaCat/UmlItem.h @@ -50,7 +50,7 @@ class UmlItem : public UmlBaseItem #ifdef ROUNDTRIP virtual void upload(ClassContainer *); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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..d3a88794e 100644 --- a/src/JavaCat/UmlOperation.cpp +++ b/src/JavaCat/UmlOperation.cpp @@ -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 & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -958,7 +958,7 @@ UmlOperation * UmlOperation::already_exist(Class * container, const WrapperStr & const Q3PtrVector & ch = container->get_uml()->UmlItem::children(); UmlItem ** v = ch.data(); UmlItem ** const vsup = v + ch.size(); - Q3PtrList opers; + QList opers; for (; v != vsup; v += 1) if (((*v)->kind() == anOperation) && @@ -973,17 +973,16 @@ 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 same_names; + QList same_names; // search for operation having the same params name and number - for (op = opers.first(); op != 0; op = opers.next()) { + foreach (UmlOperation *op, opers) { Q3ValueList ps = op->params(); Q3ValueList::ConstIterator it1; Q3ValueList::ConstIterator it2; @@ -1020,7 +1019,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..67b112c8b 100644 --- a/src/JavaCat/UmlOperation.h +++ b/src/JavaCat/UmlOperation.h @@ -59,7 +59,7 @@ class UmlOperation : public UmlBaseOperation const WrapperStr & array, WrapperStr comment, WrapperStr description, WrapperStr annotation #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ); diff --git a/src/JavaCat/UmlPackage.cpp b/src/JavaCat/UmlPackage.cpp index 12c843e0f..256273389 100644 --- a/src/JavaCat/UmlPackage.cpp +++ b/src/JavaCat/UmlPackage.cpp @@ -189,7 +189,7 @@ bool UmlPackage::set_roundtrip_expected() return result; } -void UmlPackage::mark_useless(Q3PtrList & l) +void UmlPackage::mark_useless(QList & l) { Q3PtrVector ch = UmlItem::children(); UmlClassItem ** v = (UmlClassItem **) ch.data(); diff --git a/src/JavaCat/UmlPackage.h b/src/JavaCat/UmlPackage.h index dfa0b90d8..e0410a32d 100644 --- a/src/JavaCat/UmlPackage.h +++ b/src/JavaCat/UmlPackage.h @@ -54,7 +54,7 @@ class UmlPackage : public UmlBasePackage void init(Package *); virtual void upload(ClassContainer *); virtual bool set_roundtrip_expected(); - virtual void mark_useless(Q3PtrList & l); + virtual void mark_useless(QList & 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..cfda0cd82 100644 --- a/src/JavaCat/UmlRelation.cpp +++ b/src/JavaCat/UmlRelation.cpp @@ -98,7 +98,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name, WrapperStr comment, WrapperStr description, WrapperStr annotation #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { @@ -281,7 +281,7 @@ bool UmlRelation::new_one(Class * container, const WrapperStr & name, WrapperStr comment, WrapperStr description, WrapperStr annotation #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & expected_order #endif ) { diff --git a/src/JavaCat/UmlRelation.h b/src/JavaCat/UmlRelation.h index 22ca04c0e..3d9603985 100644 --- a/src/JavaCat/UmlRelation.h +++ b/src/JavaCat/UmlRelation.h @@ -54,7 +54,7 @@ class UmlRelation : public UmlBaseRelation WrapperStr comment, WrapperStr description, WrapperStr annotation #ifdef ROUNDTRIP - , bool roundtrip, Q3PtrList & expected_order + , bool roundtrip, QList & 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 & expected_order + , bool roundtrip, QList & expected_order #endif ); #ifdef ROUNDTRIP 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 & dependencies, +bool UmlClassMember::compute_dependency(QList & dependencies, WrapperStr decl, const UmlTypeSpec & t) { remove_comments(decl); 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 &, WrapperStr) { +void UmlExtraClassMember::compute_dependency(QList &, WrapperStr) { // does nothing } */ diff --git a/src/JavaRoundtrip/main.cpp b/src/JavaRoundtrip/main.cpp index eaea7bff5..61f08f31a 100644 --- a/src/JavaRoundtrip/main.cpp +++ b/src/JavaRoundtrip/main.cpp @@ -201,7 +201,7 @@ int main(int argc, char ** argv) (*v)->set_isMarked(FALSE); } - Q3PtrList useless; + QList useless; item->mark_useless(useless); @@ -212,13 +212,11 @@ int main(int argc, char ** argv) "Delete them ?", "Yes", "No", QString(), 1, 1) == 0)) { - Q3PtrListIterator 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/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 & dependencies, +bool UmlClassMember::compute_dependency(QList & dependencies, WrapperStr decl, const UmlTypeSpec & t) { remove_comments(decl); 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 &, WrapperStr) { +void UmlExtraClassMember::compute_dependency(QList &, WrapperStr) { // does nothing } */ diff --git a/src/PhpReverse/BrowserNode.h b/src/PhpReverse/BrowserNode.h index 6c84770e9..73da048b4 100644 --- a/src/PhpReverse/BrowserNode.h +++ b/src/PhpReverse/BrowserNode.h @@ -71,7 +71,7 @@ class BrowserNode : public TreeItem #include -class BrowserNodeList : public Q3PtrList +class BrowserNodeList : public QList { 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..4b872e6ae 100644 --- a/src/PhpReverse/Class.cpp +++ b/src/PhpReverse/Class.cpp @@ -64,7 +64,7 @@ using namespace std; #include "Pixmap.h" #include "ShowFileDialog.h" -Q3PtrList Class::Historic; +QList Class::Historic; #endif Class::Class(Package * p, const char * n, char st) diff --git a/src/PhpReverse/Class.h b/src/PhpReverse/Class.h index 9c0721697..0431bc382 100644 --- a/src/PhpReverse/Class.h +++ b/src/PhpReverse/Class.h @@ -60,7 +60,7 @@ class Class : public BrowserNode bool description_updatedp; WrapperStr description; - static Q3PtrList Historic; + static QList Historic; #endif bool manage_extends(ClassContainer * container); diff --git a/src/PhpReverse/Package.cpp b/src/PhpReverse/Package.cpp index 7180c3dc1..c9443c361 100644 --- a/src/PhpReverse/Package.cpp +++ b/src/PhpReverse/Package.cpp @@ -742,9 +742,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; diff --git a/src/PhpReverse/TreeItem.h b/src/PhpReverse/TreeItem.h index d9b34dd79..2b186f7db 100644 --- a/src/PhpReverse/TreeItem.h +++ b/src/PhpReverse/TreeItem.h @@ -39,14 +39,14 @@ #else -#include -#include +#include +#include class TreeItem { private: TreeItem * its_parent; - Q3PtrList its_children; + QList 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 &children() const { + return its_children; + } }; #endif diff --git a/src/ProjectControl/BrowserNode.h b/src/ProjectControl/BrowserNode.h index 90a749bc7..c1d6fd4f3 100644 --- a/src/ProjectControl/BrowserNode.h +++ b/src/ProjectControl/BrowserNode.h @@ -77,7 +77,7 @@ class BrowserNode : public Q3ListViewItem #include -class BrowserNodeList : public Q3PtrList +class BrowserNodeList : public QList { public: void search(BrowserNode * bn, const QString & s, bool cs); diff --git a/src/ProjectSynchro/BrowserView.cpp b/src/ProjectSynchro/BrowserView.cpp index 26abc9a77..c6b50ef54 100644 --- a/src/ProjectSynchro/BrowserView.cpp +++ b/src/ProjectSynchro/BrowserView.cpp @@ -95,7 +95,7 @@ void BrowserView::select(Q3ListViewItem * b) if (!ongoing) { ongoing = TRUE; - const Q3PtrList & l = SynchroWindow::get_browsers(); + const QList & l = SynchroWindow::get_browsers(); Q3PtrListIterator it(l); QString fn = ((BrowserNode *) b)->file_name(); @@ -136,7 +136,7 @@ struct Use { Use(int rev) : rev_min(rev), rev_max(rev), count(1) {} }; -void BrowserView::update(const Q3PtrList & lv) +void BrowserView::update(const QList & lv) { Q3Dict all_nodes(DICT_SIZE); Q3PtrListIterator itv(lv); @@ -218,7 +218,7 @@ void BrowserView::update(const Q3PtrList & lv) for (it = deleted_or_new.begin(); it != deleted_or_new.end(); ++it) { QString who = *it; - Q3PtrList images; + QList images; bool young = FALSE; // set the state in each view without looking at the others diff --git a/src/ProjectSynchro/BrowserView.h b/src/ProjectSynchro/BrowserView.h index ddf6b31c3..1a754d3cd 100644 --- a/src/ProjectSynchro/BrowserView.h +++ b/src/ProjectSynchro/BrowserView.h @@ -77,7 +77,7 @@ class BrowserView : public Q3ListView void synchronize(); - static void update(const Q3PtrList &); + static void update(const QList &); protected: void update_it(); diff --git a/src/ProjectSynchro/SynchroDialog.cpp b/src/ProjectSynchro/SynchroDialog.cpp index a3fd272e2..bff5c2b5d 100644 --- a/src/ProjectSynchro/SynchroDialog.cpp +++ b/src/ProjectSynchro/SynchroDialog.cpp @@ -39,7 +39,7 @@ #include "SynchroDialog.h" #include "BrowserView.h" -SynchroDialog::SynchroDialog(Q3PtrList & b) +SynchroDialog::SynchroDialog(QList & b) : QDialog(0, "Synchronize", TRUE), browsers(b) { setCaption("Synchronize"); diff --git a/src/ProjectSynchro/SynchroDialog.h b/src/ProjectSynchro/SynchroDialog.h index 5a5066ddf..5b90ceb87 100644 --- a/src/ProjectSynchro/SynchroDialog.h +++ b/src/ProjectSynchro/SynchroDialog.h @@ -41,11 +41,11 @@ class SynchroDialog : public QDialog Q_OBJECT protected: - Q3PtrList & browsers; - Q3PtrList checks; + QList & browsers; + QList checks; public: - SynchroDialog(Q3PtrList & b); + SynchroDialog(QList & b); virtual ~SynchroDialog(); public slots: diff --git a/src/ProjectSynchro/SynchroWindow.h b/src/ProjectSynchro/SynchroWindow.h index 97eb64d75..7e8a7c614 100644 --- a/src/ProjectSynchro/SynchroWindow.h +++ b/src/ProjectSynchro/SynchroWindow.h @@ -49,7 +49,7 @@ class SynchroWindow : public Q3MainWindow void load(int argc, char ** argv); - static const Q3PtrList & get_browsers() { + static const QList & get_browsers() { return the->browsers; } static void abort(); @@ -58,7 +58,7 @@ class SynchroWindow : public Q3MainWindow static SynchroWindow * the; QString project_name; - Q3PtrList browsers; + QList browsers; Q3HBox * hbox; void load(QString path); diff --git a/src/browser/BrowserActivity.cpp b/src/browser/BrowserActivity.cpp index 8b35014b3..591e05dac 100644 --- a/src/browser/BrowserActivity.cpp +++ b/src/browser/BrowserActivity.cpp @@ -142,7 +142,7 @@ void BrowserActivity::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserActivity::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserActivity::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -153,7 +153,7 @@ void BrowserActivity::referenced_by(Q3PtrList & l, bool ondelete) } // callers suppose this only take specification into acount -void BrowserActivity::compute_referenced_by(Q3PtrList & l, +void BrowserActivity::compute_referenced_by(QList & l, BrowserOperation * op) { IdIterator it(all); @@ -749,13 +749,11 @@ bool BrowserActivity::tool_cmd(ToolCom * com, const char * args) } } -bool BrowserActivity::may_contains_them(const Q3PtrList & l, +bool BrowserActivity::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { - switch (it.current()->get_type()) { + foreach (BrowserNode *node, l) { + switch (node->get_type()) { case UmlInterruptibleActivityRegion: case UmlExpansionRegion: case UmlParameter: @@ -771,16 +769,16 @@ bool BrowserActivity::may_contains_them(const Q3PtrList & 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)) + if (! may_contains(node, FALSE)) return FALSE; - duplicable = may_contains_it(it.current()); + duplicable = may_contains_it(node); } return TRUE; diff --git a/src/browser/BrowserActivity.h b/src/browser/BrowserActivity.h index 9db970f22..fbd63eef8 100644 --- a/src/browser/BrowserActivity.h +++ b/src/browser/BrowserActivity.h @@ -64,7 +64,7 @@ class BrowserActivity : public BrowserNode, public Labeled BrowserActivity(const BrowserActivity * model, BrowserNode * p); virtual ~BrowserActivity(); - virtual bool may_contains_them(const Q3PtrList & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; virtual BrowserNode * duplicate(BrowserNode * p, QString name = QString()); @@ -108,8 +108,8 @@ class BrowserActivity : public BrowserNode, public Labeled virtual bool tool_cmd(ToolCom * com, const char * args); virtual bool api_compatible(unsigned v) const; - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserOperation *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserOperation *); static void init(); static const QStringList & default_stereotypes(); diff --git a/src/browser/BrowserActivityAction.cpp b/src/browser/BrowserActivityAction.cpp index 4067f9075..2f0042299 100644 --- a/src/browser/BrowserActivityAction.cpp +++ b/src/browser/BrowserActivityAction.cpp @@ -137,7 +137,7 @@ void BrowserActivityAction::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserActivityAction::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserActivityAction::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserFlow::compute_referenced_by(l, this); @@ -146,7 +146,7 @@ void BrowserActivityAction::referenced_by(Q3PtrList & l, bool ondel BrowserActivityDiagram::compute_referenced_by(l, this, "activityactioncanvas", "activityaction_ref"); } -void BrowserActivityAction::compute_referenced_by(Q3PtrList & l, +void BrowserActivityAction::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); @@ -961,18 +961,16 @@ bool BrowserActivityAction::tool_cmd(ToolCom * com, const char * args) } } -bool BrowserActivityAction::may_contains_them(const Q3PtrList & l, +bool BrowserActivityAction::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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 +979,10 @@ bool BrowserActivityAction::may_contains_them(const Q3PtrList & 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; diff --git a/src/browser/BrowserActivityAction.h b/src/browser/BrowserActivityAction.h index 0f378a49a..1b57ed00b 100644 --- a/src/browser/BrowserActivityAction.h +++ b/src/browser/BrowserActivityAction.h @@ -70,7 +70,7 @@ class BrowserActivityAction : public BrowserNode, public Labeled & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; static BrowserActivityAction * add_activityaction(BrowserNode * future_parent, const char * s); @@ -133,8 +133,8 @@ class BrowserActivityAction : public BrowserNode, public Labeled &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserNode *); static void init(); static const QStringList & default_stereotypes(); diff --git a/src/browser/BrowserActivityDiagram.cpp b/src/browser/BrowserActivityDiagram.cpp index c634f7407..a2b40467a 100644 --- a/src/browser/BrowserActivityDiagram.cpp +++ b/src/browser/BrowserActivityDiagram.cpp @@ -55,7 +55,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserActivityDiagram::imported; +QList BrowserActivityDiagram::imported; Q3ValueList BrowserActivityDiagram::imported_ids; QStringList BrowserActivityDiagram::its_default_stereotypes; // unicode @@ -162,14 +162,12 @@ void BrowserActivityDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserActivityDiagram * d = imported.take(0); - + foreach (BrowserActivityDiagram *d, imported) { (new ActivityDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserActivityDiagram::renumber(int phase) @@ -613,7 +611,7 @@ const QStringList & BrowserActivityDiagram::default_stereotypes() return its_default_stereotypes; } -void BrowserActivityDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserActivityDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserActivityDiagram.h b/src/browser/BrowserActivityDiagram.h index c38a0ce24..6f5d45bb8 100644 --- a/src/browser/BrowserActivityDiagram.h +++ b/src/browser/BrowserActivityDiagram.h @@ -45,7 +45,7 @@ class BrowserActivityDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -119,7 +119,7 @@ class BrowserActivityDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & 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..ab13d2be0 100644 --- a/src/browser/BrowserActivityNode.cpp +++ b/src/browser/BrowserActivityNode.cpp @@ -121,7 +121,7 @@ void BrowserActivityNode::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserActivityNode::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserActivityNode::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserFlow::compute_referenced_by(l, this); @@ -201,7 +201,7 @@ const QPixmap * BrowserActivityNode::pixmap(int) const bool BrowserActivityNode::target_of_flow() const { - Q3PtrList l; + QList l; BrowserFlow::compute_referenced_by(l, this); return !l.isEmpty(); diff --git a/src/browser/BrowserActivityNode.h b/src/browser/BrowserActivityNode.h index af67639c5..b2be07a73 100644 --- a/src/browser/BrowserActivityNode.h +++ b/src/browser/BrowserActivityNode.h @@ -98,7 +98,7 @@ class BrowserActivityNode : public BrowserNode, public Labeled &, bool ondelete = FALSE); + virtual void referenced_by(QList &, 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..f5558367e 100644 --- a/src/browser/BrowserActivityObject.cpp +++ b/src/browser/BrowserActivityObject.cpp @@ -121,7 +121,7 @@ void BrowserActivityObject::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserActivityObject::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserActivityObject::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserFlow::compute_referenced_by(l, this); @@ -130,7 +130,7 @@ void BrowserActivityObject::referenced_by(Q3PtrList & l, bool ondel BrowserActivityDiagram::compute_referenced_by(l, this, "activityobjectcanvas", "activityobject_ref"); } -void BrowserActivityObject::compute_referenced_by(Q3PtrList & l, +void BrowserActivityObject::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); @@ -609,25 +609,23 @@ bool BrowserActivityObject::tool_cmd(ToolCom * com, const char * args) } } -bool BrowserActivityObject::may_contains_them(const Q3PtrList & l, +bool BrowserActivityObject::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { - switch (it.current()->get_type()) { + 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)) + if (! may_contains(node, FALSE)) return FALSE; - duplicable = may_contains_it(it.current()); + duplicable = may_contains_it(node); } return TRUE; diff --git a/src/browser/BrowserActivityObject.h b/src/browser/BrowserActivityObject.h index 1ef48ba1f..0d1a4aeb8 100644 --- a/src/browser/BrowserActivityObject.h +++ b/src/browser/BrowserActivityObject.h @@ -66,7 +66,7 @@ class BrowserActivityObject : public BrowserNode, public Labeled & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; static BrowserActivityObject * add_activityobject(BrowserNode * future_parent, const char * s); @@ -109,8 +109,8 @@ class BrowserActivityObject : public BrowserNode, public Labeled &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserNode *); static void init(); static const QStringList & default_stereotypes(); diff --git a/src/browser/BrowserActivityPartition.cpp b/src/browser/BrowserActivityPartition.cpp index 2c18ac628..8bc4aca66 100644 --- a/src/browser/BrowserActivityPartition.cpp +++ b/src/browser/BrowserActivityPartition.cpp @@ -123,7 +123,7 @@ void BrowserActivityPartition::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserActivityPartition::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserActivityPartition::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -510,25 +510,23 @@ bool BrowserActivityPartition::tool_cmd(ToolCom * com, const char * args) } } -bool BrowserActivityPartition::may_contains_them(const Q3PtrList & l, +bool BrowserActivityPartition::may_contains_them(const QList & l, BooL & duplicable) const { BrowserNode * activity = get_container(UmlActivity); - Q3PtrListIterator 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)) + if (! may_contains(node, FALSE)) return FALSE; - duplicable = may_contains_it(it.current()); + duplicable = may_contains_it(node); } return TRUE; diff --git a/src/browser/BrowserActivityPartition.h b/src/browser/BrowserActivityPartition.h index e410a13da..543098f6e 100644 --- a/src/browser/BrowserActivityPartition.h +++ b/src/browser/BrowserActivityPartition.h @@ -62,7 +62,7 @@ class BrowserActivityPartition : public BrowserNode, public Labeled & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; virtual BrowserNode * duplicate(BrowserNode * p, QString name = QString()); @@ -94,7 +94,7 @@ class BrowserActivityPartition : public BrowserNode, public Labeled & l, bool ondelete); + virtual void referenced_by(QList & 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 0c374d812..47e046397 100644 --- a/src/browser/BrowserArtifact.cpp +++ b/src/browser/BrowserArtifact.cpp @@ -151,7 +151,7 @@ void BrowserArtifact::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserArtifact::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserArtifact::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); compute_referenced_by(l, this); @@ -160,7 +160,7 @@ void BrowserArtifact::referenced_by(Q3PtrList & l, bool ondelete) BrowserDeploymentDiagram::compute_referenced_by(l, this, "artifactcanvas", "artifact_ref"); } -void BrowserArtifact::compute_referenced_by(Q3PtrList & l, +void BrowserArtifact::compute_referenced_by(QList & l, BrowserClass * target) { IdIterator it(all); @@ -175,7 +175,7 @@ void BrowserArtifact::compute_referenced_by(Q3PtrList & l, } } -void BrowserArtifact::compute_referenced_by(Q3PtrList & l, +void BrowserArtifact::compute_referenced_by(QList & l, BrowserArtifact * target) { IdIterator it(all); diff --git a/src/browser/BrowserArtifact.h b/src/browser/BrowserArtifact.h index 52b4d61a1..0d940add6 100644 --- a/src/browser/BrowserArtifact.h +++ b/src/browser/BrowserArtifact.h @@ -121,9 +121,9 @@ class BrowserArtifact : public BrowserNode, public Labeled virtual const QPixmap * pixmap(int) const; virtual void iconChanged(); - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserArtifact *); - static void compute_referenced_by(Q3PtrList &, BrowserClass *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserArtifact *); + static void compute_referenced_by(QList &, BrowserClass *); static void init(); static const QStringList & default_stereotypes(); diff --git a/src/browser/BrowserAttribute.cpp b/src/browser/BrowserAttribute.cpp index 74162120b..1e6fc96e4 100644 --- a/src/browser/BrowserAttribute.cpp +++ b/src/browser/BrowserAttribute.cpp @@ -534,7 +534,7 @@ void BrowserAttribute::member_cpp_def(const QString & prefix, const QString &, } } -void BrowserAttribute::compute_referenced_by(Q3PtrList & l, +void BrowserAttribute::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); @@ -551,7 +551,7 @@ void BrowserAttribute::compute_referenced_by(Q3PtrList & l, } } -void BrowserAttribute::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserAttribute::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); diff --git a/src/browser/BrowserAttribute.h b/src/browser/BrowserAttribute.h index 65f764ec0..1a83493ea 100644 --- a/src/browser/BrowserAttribute.h +++ b/src/browser/BrowserAttribute.h @@ -114,8 +114,8 @@ class BrowserAttribute : public BrowserNode, public Labeled virtual void renumber(int phase); virtual void prepare_update_lib() const; - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserNode *); virtual bool tool_cmd(ToolCom * com, const char * args); diff --git a/src/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 4bde0e90f..0284d3077 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -244,7 +244,7 @@ void BrowserClass::support_file(Q3Dict & files, bool add) const ((BrowserNode *) child)->support_file(files, add); } -void BrowserClass::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserClass::referenced_by(QList & l, bool ondelete) { IdIterator it(all); BrowserClass * c; @@ -548,8 +548,7 @@ void BrowserClass::InstallParentsMenuItems(Q3PopupMenu& inhopersubm) void BrowserClass::menu() { - - Q3PtrList inheritedOperations = inherited_operations(sensible_amount_of_visible_entries); + QList inheritedOperations = inherited_operations(sensible_amount_of_visible_entries); Q3PopupMenu gensubm(0); Q3PopupMenu roundtripm(0); @@ -595,24 +594,20 @@ void BrowserClass::menu() InstallParentsMenuItems(inhopersubm); - if (inheritedOperations.count() > (unsigned)sensible_amount_of_visible_entries) + if (inheritedOperations.count() > sensible_amount_of_visible_entries) m.setWhatsThis(m.insertItem(TR("Add inherited operation"), too_much_inherited_functions_index), TR("to redefine an inherited operation in the class")); else { - BrowserOperation * oper; - MenuFactory::createTitle(inhopersubm, TR("Choose operation to add it")); inhopersubm.insertSeparator(); - 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(); @@ -623,6 +618,7 @@ void BrowserClass::menu() } else inhopersubm.insertItem(menuItemText, index); + ++index; } m.setWhatsThis(m.insertItem(TR("Add inherited operation"), &inhopersubm), @@ -818,7 +814,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 inheritedOperations = inherited_operations(sensible_amount_of_visible_entries,parentName); + QList inheritedOperations = inherited_operations(sensible_amount_of_visible_entries,parentName); for(auto operation: inheritedOperations) { add_inherited_operation(operation); @@ -917,7 +913,7 @@ QList BrowserClass::CollectSameThroughInheritance(OperationData } void BrowserClass::exec_menu_choice(int rank, - Q3PtrList & l) + QList & l) { bool isstereotypemetaclass = ((strcmp(def->get_stereotype(), "stereotype") == 0) || @@ -1234,7 +1230,7 @@ void BrowserClass::apply_shortcut(QString s) } } - Q3PtrList l; + QList l; exec_menu_choice(choice, l); } @@ -1634,22 +1630,21 @@ bool BrowserClass::allow_spaces() const QList BrowserClass::get_all_parents() { QList result; - Q3PtrList notyet = parents(); + QList 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 grand_parents = cl->parents(); - BrowserNode * gp; + QList 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); } } @@ -1674,22 +1669,21 @@ UmlVisibility BrowserClass::get_visibility() const // compute all parents, grand parents ... -void BrowserClass::get_all_parents(Q3PtrList & l) const +void BrowserClass::get_all_parents(QList & l) const { - Q3PtrList notyet = parents(); + QList 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 grand_parents = cl->parents(); - BrowserNode * gp; + QList 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); } } @@ -1697,21 +1691,18 @@ void BrowserClass::get_all_parents(Q3PtrList & l) const // returns all attributes included the inherited -void BrowserClass::get_attrs(BrowserNodeList & attributes) const +void BrowserClass::get_attrs(BrowserNodeList & attributes) { attributes.clear(); - Q3PtrList lcl; + QList lcl; get_all_parents(lcl); lcl.append(this); - Q3PtrListIterator it(lcl); - - for (; it.current(); ++it) { + foreach (BrowserClass *current, lcl) { Q3ListViewItem * child; - - for (child = it.current()->firstChild(); child; child = child->nextSibling()) + for (child = current->firstChild(); child; child = child->nextSibling()) if (!((BrowserNode *) child)->deletedp() && (((BrowserNode *) child)->get_type() == UmlAttribute)) attributes.append((BrowserNode *) child); @@ -1724,7 +1715,7 @@ void BrowserClass::get_attrs(BrowserNodeList & attributes) const void BrowserClass::get_opers(Q3ValueList & opers, QStringList & list) const { - Q3PtrList all_parents; + QList all_parents; get_all_parents(all_parents); @@ -1747,9 +1738,7 @@ void BrowserClass::get_opers(Q3ValueList & opers, // 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()) { @@ -1794,14 +1783,14 @@ void BrowserClass::get_own_opers(Q3ValueList &opers, QStringLis void BrowserClass::get_inherited_opers(Q3ValueList< OperationData *> &opers, QStringList &list) { - Q3PtrList all_parents; + QList all_parents; get_all_parents(all_parents); - BrowserClass * cl; Q3ListViewItem * child; Q3Dict already(499); - for (cl = all_parents.first(); cl != 0; cl = all_parents.next()) + + foreach (BrowserClass * cl, all_parents) { for (child = cl->firstChild(); child; child = child->nextSibling()) { @@ -1852,16 +1841,14 @@ void BrowserClass::get_used_inherited_opers() // search for the relations from classes of 'from' having // target in 'to' -static void get_assocs(Q3PtrList & from, - Q3PtrList & to, - Q3PtrList & rels) +static void get_assocs(QList & from, + QList & to, + QList & rels) { - Q3PtrListIterator it(from); - - for (; it.current(); ++it) { + foreach (BrowserClass *current, from) { Q3ListViewItem * 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: @@ -1873,8 +1860,8 @@ static void get_assocs(Q3PtrList & 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); } @@ -1890,10 +1877,10 @@ static void get_assocs(Q3PtrList & from, // 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 & l, int * rev) const + QList & l, int * rev) const { - Q3PtrList la; - Q3PtrList lb; + QList la; + QList lb; get_all_parents(la); target->get_all_parents(lb); @@ -1903,28 +1890,26 @@ void BrowserClass::get_rels(BrowserClass * target, if (rev != 0) { *rev = l.count(); - Q3PtrList ll; + QList 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 & from, - Q3PtrList & to, - Q3PtrList & rels) +static void get_assocs(QList & from, + QList & to, + QList & rels) { - Q3PtrListIterator it(from); - - for (; it.current(); ++it) { + foreach (BrowserClass *current, from) { Q3ListViewItem * 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: @@ -1933,13 +1918,13 @@ static void get_assocs(Q3PtrList & 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); } @@ -1954,10 +1939,10 @@ static void get_assocs(Q3PtrList & from, // returns all relation to target included the inherited // (may be the reverse direction of a bidir) void BrowserClass::get_rels(BrowserClass * target, - Q3PtrList & l) const + QList & l) const { - Q3PtrList la; - Q3PtrList lb; + QList la; + QList lb; get_all_parents(la); target->get_all_parents(lb); @@ -1970,13 +1955,13 @@ void BrowserClass::get_rels(BrowserClass * target, // except deleted void BrowserClass::get_tree(BrowserNodeList & l) { - Q3PtrList all_parents; + QList 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); @@ -2038,36 +2023,28 @@ void BrowserClass::DragMoveInsideEvent(QDragMoveEvent * e) e->ignore(); } -bool BrowserClass::may_contains_them(const Q3PtrList & l, +bool BrowserClass::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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: - { + case UmlAttribute: { // BrowserAttribute* asAttribute = ((BrowserAttribute *) it.current()); // if (asAttribute->get_get_oper()) // { @@ -2091,15 +2068,14 @@ bool BrowserClass::may_contains_them(const Q3PtrList & 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()) ; + default: { + bool isNotRelation = !IsaRelation(current->get_type()) ; //bool parentIsOtherNode = (((const BrowserNode *) it.current()->parent()) != this); if (isNotRelation/* || parentIsOtherNode*/) return FALSE; @@ -2109,10 +2085,10 @@ bool BrowserClass::may_contains_them(const Q3PtrList & 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; @@ -2346,9 +2322,9 @@ BrowserClass * BrowserClass::add_class(bool stereotypep, } -Q3PtrList BrowserClass::parents() const +QList BrowserClass::parents() const { - Q3PtrList l; + QList l; Q3ListViewItem * child; for (child = firstChild(); child != 0; child = child->nextSibling()) { @@ -2397,11 +2373,11 @@ QString BrowserClass::check_inherit(const BrowserNode * new_parent) const : BrowserNode::check_inherit(new_parent); } -Q3PtrList BrowserClass::inherited_operations(unsigned limit, QString parent_name) const +QList BrowserClass::inherited_operations(unsigned limit, QString parent_name) const { QApplication::setOverrideCursor(::Qt::waitCursor); - Q3PtrList all_parents; + QList all_parents; get_all_parents(all_parents); @@ -2409,8 +2385,7 @@ Q3PtrList BrowserClass::inherited_operations(unsigned limit, Q Q3ListViewItem * child; Q3Dict already(499); - for (child = firstChild(); child; child = child->nextSibling()) - { + for (child = firstChild(); child; child = child->nextSibling()) { BrowserNode * childAsNode = dynamic_cast(child); BrowserOperation * childAsOperation = dynamic_cast(child); @@ -2421,16 +2396,13 @@ Q3PtrList BrowserClass::inherited_operations(unsigned limit, Q } // computes undefined inherited operations list - Q3PtrList l; - BrowserClass * cl; + QList l; - 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(child); BrowserOperation * childAsOperation = dynamic_cast(child); @@ -2443,31 +2415,26 @@ Q3PtrList 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); - if (other == 0) - { + if (other == 0) { l.append(childAsOperation); already.insert(profile, childAsOperation); - if (l.count() >= limit) - { + if (l.count() >= static_cast(limit)) { QApplication::restoreOverrideCursor(); return l; } - } - else if (! data->get_is_abstract() && + } else if (! data->get_is_abstract() && ((OperationData *) other->get_data()) - ->get_is_abstract()) - { + ->get_is_abstract()) { // to know later if the oper is abstract or not already.replace(profile, childAsOperation); - l.removeRef(other); + l.remove(other); l.append(childAsOperation); } } @@ -3828,7 +3795,7 @@ static BrowserClass * add_metaclass(BrowserClass * cl, const char * mclname, } static void extend(BrowserClass * cl, WrapperStr mclpath, - Q3PtrList & metaclasses) + QList & metaclasses) { int index = mclpath.find('#'); @@ -3840,36 +3807,38 @@ 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 it(metaclasses); - BrowserClass * mcl; - + BrowserClass *metaclass = 0; if (dflt) { - for (; (mcl = it.current()) != 0; ++it) { + foreach (BrowserClass *mcl, metaclasses) { if (!strcmp(mclname, mcl->get_name())) { const char * s = mcl->get_value("metaclassPath"); - if ((s == 0) || !strcmp(s, defltpath0) || !strcmp(s, defltpath1)) + if ((s == 0) || !strcmp(s, defltpath0) || !strcmp(s, defltpath1)) { + metaclass = mcl; break; + } } } } else { - for (; (mcl = it.current()) != 0; ++it) { + foreach (BrowserClass *mcl, metaclasses) { if (!strcmp(mclname, mcl->get_name())) { const char * s = mcl->get_value("metaclassPath"); - if ((s != 0) && (path == s)) + if ((s != 0) && (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); } } @@ -3882,8 +3851,8 @@ void BrowserClass::post_load() BrowserOperation::post_load(); // must be done after rel and attr post_load if (NeedPostLoad) { - Q3PtrList stereotypes; - Q3PtrList metaclasses; + QList stereotypes; + QList metaclasses; IdIterator it(all); BrowserClass * cl; @@ -3904,9 +3873,7 @@ void BrowserClass::post_load() ++it; } - while (! stereotypes.isEmpty()) { - cl = stereotypes.take(0); - + foreach (cl, stereotypes) { WrapperStr s = cl->get_value("stereotypeExtension"); // non empty s = s.simplifyWhiteSpace(); @@ -3923,6 +3890,7 @@ void BrowserClass::post_load() cl->remove_key_value("stereotypeExtension"); } + stereotypes.clear(); NeedPostLoad = FALSE; } diff --git a/src/browser/BrowserClass.h b/src/browser/BrowserClass.h index c6a160fb7..7c4a1a647 100644 --- a/src/browser/BrowserClass.h +++ b/src/browser/BrowserClass.h @@ -70,7 +70,7 @@ class BrowserClass : public BrowserNode, public Labeled protected: - void exec_menu_choice(int index, Q3PtrList & l); + void exec_menu_choice(int index, QList & l); public: BrowserClass(QString s, BrowserNode * p, ClassData * d, int id = 0); @@ -87,12 +87,12 @@ class BrowserClass : public BrowserNode, public Labeled BrowserNode * addOperation(BrowserOperation * oper = nullptr); BrowserNode * add_inherited_operation(BrowserOperation * model); BrowserNode * add_extra_member(BrowserExtraMember * em = 0); - Q3PtrList inherited_operations(unsigned limit, QString parent_name = QString()) const; + QList inherited_operations(unsigned limit, 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 parents() const; - void get_all_parents(Q3PtrList &) const; + virtual QList parents() const; + void get_all_parents(QList &) const; // more modern interface to get all parents. Still a lot of qt3 compatibility inside QList get_all_parents(); QStringList get_parents_names(); @@ -111,9 +111,9 @@ class BrowserClass : public BrowserNode, public Labeled - void get_attrs(BrowserNodeList &) const; - void get_rels(BrowserClass *, Q3PtrList &, int * rev = 0) const; - void get_rels(BrowserClass * target, Q3PtrList & l) const; + void get_attrs(BrowserNodeList &); + void get_rels(BrowserClass *, QList &, int * rev = 0) const; + void get_rels(BrowserClass * target, QList & l) const; void get_tree(BrowserNodeList &); virtual BrowserNode * get_associated() const; void set_associated_diagram(BrowserClassDiagram *, bool on_read = FALSE); @@ -125,7 +125,7 @@ class BrowserClass : public BrowserNode, public Labeled virtual void delete_it(); virtual bool undelete(bool rec, QString & warning, QString & renamed); - virtual bool may_contains_them(const Q3PtrList &, + virtual bool may_contains_them(const QList &, BooL & duplicable) const; virtual void move(BrowserNode *, BrowserNode * after); virtual BrowserNode * duplicate(BrowserNode * p, @@ -185,7 +185,7 @@ class BrowserClass : public BrowserNode, public Labeled static void read_stereotypes(char *& , char *&); static void save_stereotypes(QTextStream &); - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); + virtual void referenced_by(QList &, bool ondelete = FALSE); static bool new_java_enums(QString new_st); diff --git a/src/browser/BrowserClassDiagram.cpp b/src/browser/BrowserClassDiagram.cpp index 9e29cea3f..d8617f127 100644 --- a/src/browser/BrowserClassDiagram.cpp +++ b/src/browser/BrowserClassDiagram.cpp @@ -54,7 +54,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserClassDiagram::imported; +QList BrowserClassDiagram::imported; Q3ValueList BrowserClassDiagram::imported_ids; QStringList BrowserClassDiagram::its_default_stereotypes; // unicode @@ -148,14 +148,12 @@ void BrowserClassDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserClassDiagram * d = imported.take(0); - + foreach (BrowserClassDiagram *d, imported) { (new ClassDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserClassDiagram::renumber(int phase) @@ -531,7 +529,7 @@ bool BrowserClassDiagram::tool_cmd(ToolCom * com, const char * args) } } -void BrowserClassDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserClassDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserClassDiagram.h b/src/browser/BrowserClassDiagram.h index 155ebbdc0..da0d05ce8 100644 --- a/src/browser/BrowserClassDiagram.h +++ b/src/browser/BrowserClassDiagram.h @@ -45,7 +45,7 @@ class BrowserClassDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -113,7 +113,7 @@ class BrowserClassDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & l, BrowserNode *, const char * kc, char const * kr); }; diff --git a/src/browser/BrowserClassInstance.cpp b/src/browser/BrowserClassInstance.cpp index 9755e3037..fec8619b8 100644 --- a/src/browser/BrowserClassInstance.cpp +++ b/src/browser/BrowserClassInstance.cpp @@ -208,7 +208,7 @@ void BrowserClassInstance::update_stereotype(bool) } } -void BrowserClassInstance::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserClassInstance::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserClassInstance::compute_referenced_by(l, this); @@ -220,7 +220,7 @@ void BrowserClassInstance::referenced_by(Q3PtrList & l, bool ondele } } -void BrowserClassInstance::compute_referenced_by(Q3PtrList & l, +void BrowserClassInstance::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); diff --git a/src/browser/BrowserClassInstance.h b/src/browser/BrowserClassInstance.h index 7eccd480b..9a59d14e9 100644 --- a/src/browser/BrowserClassInstance.h +++ b/src/browser/BrowserClassInstance.h @@ -93,8 +93,8 @@ class BrowserClassInstance : public BrowserNode, public Labeled &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, 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..22802a6b6 100644 --- a/src/browser/BrowserClassView.cpp +++ b/src/browser/BrowserClassView.cpp @@ -980,13 +980,11 @@ void BrowserClassView::DragMoveInsideEvent(QDragMoveEvent * e) e->ignore(); } -bool BrowserClassView::may_contains_them(const Q3PtrList & l, +bool BrowserClassView::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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 +993,7 @@ bool BrowserClassView::may_contains_them(const Q3PtrList & l, case UmlObjectDiagram: case UmlState: case UmlActivity: - if (! may_contains(it.current(), FALSE)) + if (! may_contains(current, FALSE)) return FALSE; break; @@ -1004,7 +1002,7 @@ bool BrowserClassView::may_contains_them(const Q3PtrList & l, return FALSE; } - duplicable = may_contains_it(it.current()); + duplicable = may_contains_it(current); } return TRUE; diff --git a/src/browser/BrowserClassView.h b/src/browser/BrowserClassView.h index b75d8e2e7..24dfebb0a 100644 --- a/src/browser/BrowserClassView.h +++ b/src/browser/BrowserClassView.h @@ -97,7 +97,7 @@ class BrowserClassView : public BrowserNode, public Labeled virtual QString get_stype() const; virtual int get_identifier() const; virtual const char * help_topic() const; - virtual bool may_contains_them(const Q3PtrList &, + virtual bool may_contains_them(const QList &, 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..9e56be1e3 100644 --- a/src/browser/BrowserColDiagram.cpp +++ b/src/browser/BrowserColDiagram.cpp @@ -53,7 +53,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserColDiagram::imported; +QList BrowserColDiagram::imported; Q3ValueList BrowserColDiagram::imported_ids; QStringList BrowserColDiagram::its_default_stereotypes; // unicode @@ -147,14 +147,12 @@ void BrowserColDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserColDiagram * d = imported.take(0); - + foreach (BrowserColDiagram *d, imported) { (new ColDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserColDiagram::renumber(int phase) @@ -554,7 +552,7 @@ bool BrowserColDiagram::tool_cmd(ToolCom * com, const char * args) } } -void BrowserColDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserColDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserColDiagram.h b/src/browser/BrowserColDiagram.h index 021e766e6..812580630 100644 --- a/src/browser/BrowserColDiagram.h +++ b/src/browser/BrowserColDiagram.h @@ -44,7 +44,7 @@ class BrowserColDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -112,7 +112,7 @@ class BrowserColDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & l, BrowserNode *, const char * kc, char const * kr); }; diff --git a/src/browser/BrowserComponent.cpp b/src/browser/BrowserComponent.cpp index 16ddfcdd3..c50819180 100644 --- a/src/browser/BrowserComponent.cpp +++ b/src/browser/BrowserComponent.cpp @@ -130,7 +130,7 @@ void BrowserComponent::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserComponent::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserComponent::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -140,7 +140,7 @@ void BrowserComponent::referenced_by(Q3PtrList & l, bool ondelete) } } -void BrowserComponent::compute_referenced_by(Q3PtrList & l, +void BrowserComponent::compute_referenced_by(QList & l, BrowserClass * target) { IdIterator it(all); @@ -783,8 +783,8 @@ void BrowserComponent::get_all_provided_classes(Q3ValueList & r, r.clear(); nl.sort_it(); - while (! nl.isEmpty()) - r.append((BrowserClass *) nl.take(0)); + foreach (BrowserNode *node, nl) + r.append((BrowserClass *) node); } } @@ -824,8 +824,8 @@ void BrowserComponent::get_all_required_classes(Q3ValueList & r, r.clear(); nl.sort_it(); - while (! nl.isEmpty()) - r.append((BrowserClass *) nl.take(0)); + foreach (BrowserNode *node, nl) + r.append((BrowserClass *) node); } } diff --git a/src/browser/BrowserComponent.h b/src/browser/BrowserComponent.h index 6a7c698a8..40adb1387 100644 --- a/src/browser/BrowserComponent.h +++ b/src/browser/BrowserComponent.h @@ -124,8 +124,8 @@ class BrowserComponent : public BrowserNode, public Labeled virtual const QPixmap * pixmap(int) const; virtual void iconChanged(); - virtual void referenced_by(Q3PtrList & l, bool ondelete); - static void compute_referenced_by(Q3PtrList &, BrowserClass *); + virtual void referenced_by(QList & l, bool ondelete); + static void compute_referenced_by(QList &, BrowserClass *); static void init(); static const QStringList & default_stereotypes(); diff --git a/src/browser/BrowserComponentDiagram.cpp b/src/browser/BrowserComponentDiagram.cpp index 20147e4a8..de2ec8b13 100644 --- a/src/browser/BrowserComponentDiagram.cpp +++ b/src/browser/BrowserComponentDiagram.cpp @@ -54,7 +54,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserComponentDiagram::imported; +QList BrowserComponentDiagram::imported; Q3ValueList BrowserComponentDiagram::imported_ids; QStringList BrowserComponentDiagram::its_default_stereotypes; // unicode @@ -148,14 +148,12 @@ void BrowserComponentDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserComponentDiagram * d = imported.take(0); - + foreach (BrowserComponentDiagram *d, imported) { (new ComponentDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserComponentDiagram::renumber(int phase) @@ -536,7 +534,7 @@ bool BrowserComponentDiagram::tool_cmd(ToolCom * com, const char * args) } } -void BrowserComponentDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserComponentDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserComponentDiagram.h b/src/browser/BrowserComponentDiagram.h index a51b8851d..befc628c6 100644 --- a/src/browser/BrowserComponentDiagram.h +++ b/src/browser/BrowserComponentDiagram.h @@ -44,7 +44,7 @@ class BrowserComponentDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -112,7 +112,7 @@ class BrowserComponentDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & l, BrowserNode *, const char * kc, char const * kr); }; diff --git a/src/browser/BrowserComponentView.cpp b/src/browser/BrowserComponentView.cpp index 43e069f25..fe678829f 100644 --- a/src/browser/BrowserComponentView.cpp +++ b/src/browser/BrowserComponentView.cpp @@ -510,19 +510,17 @@ void BrowserComponentView::DragMoveInsideEvent(QDragMoveEvent * e) e->ignore(); } -bool BrowserComponentView::may_contains_them(const Q3PtrList & l, +bool BrowserComponentView::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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 +529,7 @@ bool BrowserComponentView::may_contains_them(const Q3PtrList & l, return FALSE; } - duplicable = may_contains_it(it.current()); + duplicable = may_contains_it(node); } return TRUE; diff --git a/src/browser/BrowserComponentView.h b/src/browser/BrowserComponentView.h index 9cf208286..bfc335f54 100644 --- a/src/browser/BrowserComponentView.h +++ b/src/browser/BrowserComponentView.h @@ -79,7 +79,7 @@ class BrowserComponentView : public BrowserNode, public Labeled &, + virtual bool may_contains_them(const QList &, 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..c771f5600 100644 --- a/src/browser/BrowserDeploymentDiagram.cpp +++ b/src/browser/BrowserDeploymentDiagram.cpp @@ -54,7 +54,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserDeploymentDiagram::imported; +QList BrowserDeploymentDiagram::imported; Q3ValueList BrowserDeploymentDiagram::imported_ids; QStringList BrowserDeploymentDiagram::its_default_stereotypes; // unicode @@ -152,14 +152,12 @@ void BrowserDeploymentDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserDeploymentDiagram * d = imported.take(0); - + foreach (BrowserDeploymentDiagram *d, imported) { (new DeploymentDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserDeploymentDiagram::renumber(int phase) @@ -549,7 +547,7 @@ bool BrowserDeploymentDiagram::tool_cmd(ToolCom * com, const char * args) } } -void BrowserDeploymentDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserDeploymentDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserDeploymentDiagram.h b/src/browser/BrowserDeploymentDiagram.h index 6417fc925..90268fccd 100644 --- a/src/browser/BrowserDeploymentDiagram.h +++ b/src/browser/BrowserDeploymentDiagram.h @@ -44,7 +44,7 @@ class BrowserDeploymentDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -114,7 +114,7 @@ class BrowserDeploymentDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & l, BrowserNode *, const char * kc, char const * kr); }; diff --git a/src/browser/BrowserDeploymentNode.cpp b/src/browser/BrowserDeploymentNode.cpp index 46d3a3943..c2baa6055 100644 --- a/src/browser/BrowserDeploymentNode.cpp +++ b/src/browser/BrowserDeploymentNode.cpp @@ -120,7 +120,7 @@ void BrowserDeploymentNode::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserDeploymentNode::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserDeploymentNode::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); diff --git a/src/browser/BrowserDeploymentNode.h b/src/browser/BrowserDeploymentNode.h index 9fa454fdb..5121c6d2d 100644 --- a/src/browser/BrowserDeploymentNode.h +++ b/src/browser/BrowserDeploymentNode.h @@ -92,7 +92,7 @@ class BrowserDeploymentNode : public BrowserNode, public Labeled & l, bool ondelete); + virtual void referenced_by(QList & 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..4e762a166 100644 --- a/src/browser/BrowserDeploymentView.cpp +++ b/src/browser/BrowserDeploymentView.cpp @@ -707,20 +707,18 @@ void BrowserDeploymentView::DragMoveInsideEvent(QDragMoveEvent * e) e->ignore(); } -bool BrowserDeploymentView::may_contains_them(const Q3PtrList & l, +bool BrowserDeploymentView::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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 +727,7 @@ bool BrowserDeploymentView::may_contains_them(const Q3PtrList & l, return FALSE; } - duplicable = may_contains_it(it.current()); + duplicable = may_contains_it(node); } return TRUE; diff --git a/src/browser/BrowserDeploymentView.h b/src/browser/BrowserDeploymentView.h index 3864d1093..a4a097158 100644 --- a/src/browser/BrowserDeploymentView.h +++ b/src/browser/BrowserDeploymentView.h @@ -80,7 +80,7 @@ class BrowserDeploymentView : public BrowserNode, public Labeled &, + virtual bool may_contains_them(const QList &, BooL & duplicable) const; virtual BasicData * get_data() const; virtual void get_deploymentdiagramsettings(DeploymentDiagramSettings &) const; diff --git a/src/browser/BrowserExpansionNode.cpp b/src/browser/BrowserExpansionNode.cpp index 6fdba57d9..6640f3537 100644 --- a/src/browser/BrowserExpansionNode.cpp +++ b/src/browser/BrowserExpansionNode.cpp @@ -366,7 +366,7 @@ QString BrowserExpansionNode::full_name(bool rev, bool) const return fullname(s, rev); } -void BrowserExpansionNode::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserExpansionNode::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserFlow::compute_referenced_by(l, this); @@ -375,7 +375,7 @@ void BrowserExpansionNode::referenced_by(Q3PtrList & l, bool ondele BrowserActivityDiagram::compute_referenced_by(l, this, "expansionnodecanvas", "expansionnode_ref"); } -void BrowserExpansionNode::compute_referenced_by(Q3PtrList & l, +void BrowserExpansionNode::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); diff --git a/src/browser/BrowserExpansionNode.h b/src/browser/BrowserExpansionNode.h index b0f34a2ac..2d2832640 100644 --- a/src/browser/BrowserExpansionNode.h +++ b/src/browser/BrowserExpansionNode.h @@ -96,8 +96,8 @@ class BrowserExpansionNode : public BrowserNode, public Labeled &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, 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..1c6649eb5 100644 --- a/src/browser/BrowserExpansionRegion.cpp +++ b/src/browser/BrowserExpansionRegion.cpp @@ -126,7 +126,7 @@ void BrowserExpansionRegion::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserExpansionRegion::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserExpansionRegion::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -619,17 +619,16 @@ bool BrowserExpansionRegion::tool_cmd(ToolCom * com, const char * args) } } -bool BrowserExpansionRegion::may_contains_them(const Q3PtrList & l, +bool BrowserExpansionRegion::may_contains_them(const QList & l, BooL & duplicable) const { BrowserNode * activity = get_container(UmlActivity); - Q3PtrListIterator 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 +643,7 @@ bool BrowserExpansionRegion::may_contains_them(const Q3PtrList & 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 +652,10 @@ bool BrowserExpansionRegion::may_contains_them(const Q3PtrList & 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; diff --git a/src/browser/BrowserExpansionRegion.h b/src/browser/BrowserExpansionRegion.h index 1cb5c615a..50928a10a 100644 --- a/src/browser/BrowserExpansionRegion.h +++ b/src/browser/BrowserExpansionRegion.h @@ -63,7 +63,7 @@ class BrowserExpansionRegion : public BrowserNode, public Labeled & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; virtual BrowserNode * duplicate(BrowserNode * p, QString name = QString()); @@ -101,7 +101,7 @@ class BrowserExpansionRegion : public BrowserNode, public Labeled & l, bool ondelete); + virtual void referenced_by(QList & l, bool ondelete); virtual bool tool_cmd(ToolCom * com, const char * args); virtual bool api_compatible(unsigned v) const; diff --git a/src/browser/BrowserFlow.cpp b/src/browser/BrowserFlow.cpp index b7e33ca40..cd3c44273 100644 --- a/src/browser/BrowserFlow.cpp +++ b/src/browser/BrowserFlow.cpp @@ -129,7 +129,7 @@ bool BrowserFlow::undelete(bool, QString & warning, QString & renamed) return TRUE; } -void BrowserFlow::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserFlow::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -137,7 +137,7 @@ void BrowserFlow::referenced_by(Q3PtrList & l, bool ondelete) BrowserActivityDiagram::compute_referenced_by(l, this, "flowcanvas", "flow_ref"); } -void BrowserFlow::compute_referenced_by(Q3PtrList & l, +void BrowserFlow::compute_referenced_by(QList & l, const BrowserNode * target) { IdIterator it(all); diff --git a/src/browser/BrowserFlow.h b/src/browser/BrowserFlow.h index 7c95612ee..d5ed6c5dd 100644 --- a/src/browser/BrowserFlow.h +++ b/src/browser/BrowserFlow.h @@ -91,8 +91,8 @@ class BrowserFlow : public BrowserNode, public Labeled virtual void renumber(int phase); virtual void prepare_update_lib() const; - virtual void referenced_by(Q3PtrList & l, bool ondelete); - static void compute_referenced_by(Q3PtrList &, const BrowserNode *); + virtual void referenced_by(QList & l, bool ondelete); + static void compute_referenced_by(QList &, 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..2f61e778c 100644 --- a/src/browser/BrowserInterruptibleActivityRegion.cpp +++ b/src/browser/BrowserInterruptibleActivityRegion.cpp @@ -122,7 +122,7 @@ void BrowserInterruptibleActivityRegion::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserInterruptibleActivityRegion::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserInterruptibleActivityRegion::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -561,17 +561,16 @@ bool BrowserInterruptibleActivityRegion::tool_cmd(ToolCom * com, const char * ar } } -bool BrowserInterruptibleActivityRegion::may_contains_them(const Q3PtrList & l, +bool BrowserInterruptibleActivityRegion::may_contains_them(const QList & l, BooL & duplicable) const { BrowserNode * activity = get_container(UmlActivity); - Q3PtrListIterator 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 +584,7 @@ bool BrowserInterruptibleActivityRegion::may_contains_them(const Q3PtrListget_container(UmlActivity)) != activity) + if (((const BrowserNode *) node->get_container(UmlActivity)) != activity) return FALSE; break; @@ -594,10 +593,10 @@ bool BrowserInterruptibleActivityRegion::may_contains_them(const Q3PtrList & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; virtual BrowserNode * duplicate(BrowserNode * p, QString name = QString()); @@ -98,7 +98,7 @@ class BrowserInterruptibleActivityRegion : public BrowserNode, public Labeled
& l, bool ondelete); + virtual void referenced_by(QList & 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 0672b7832..c46c9dea8 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -81,7 +81,7 @@ #include "../Logging/QsLog.h" QList BrowserNode::generatable_types; -Q3PtrList BrowserNode::marked_list; +QList BrowserNode::marked_list; static BrowserPackage * UndefinedNodePackage; @@ -139,7 +139,7 @@ BrowserNode::BrowserNode(Q3ListView * view) BrowserNode::~BrowserNode() { if (is_marked) - marked_list.removeRef(this); + marked_list.remove(this); } bool BrowserNode::is_undefined() const @@ -176,7 +176,7 @@ void BrowserNode::delete_it() is_deleted = TRUE; if (is_marked) { - marked_list.removeRef(this); + marked_list.remove(this); is_marked = FALSE; } @@ -218,7 +218,7 @@ bool BrowserNode::delete_internal(QString & warning) return FALSE; } - static Q3PtrList targetof; + static QList targetof; static bool made = FALSE; bool made_here; @@ -233,10 +233,7 @@ bool BrowserNode::delete_internal(QString & warning) bool ro = FALSE; if (!root_permission()) { - Q3PtrListIterator 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 "; @@ -255,8 +252,6 @@ bool BrowserNode::delete_internal(QString & warning) break; } } - - ++it; } } @@ -279,7 +274,7 @@ bool BrowserNode::delete_internal(QString & warning) is_deleted = TRUE; if (is_marked) { - marked_list.removeRef(this); + marked_list.remove(this); is_marked = FALSE; } @@ -301,7 +296,7 @@ void BrowserNode::set_comment(QString c) comment = c; } -void BrowserNode::referenced_by(Q3PtrList & l, bool) +void BrowserNode::referenced_by(QList & l, bool) { BrowserSimpleRelation::compute_referenced_by(l, this); } @@ -779,14 +774,11 @@ BrowserNode *BrowserNode::get_first_generatable_node() QList BrowserNode::get_generation_list() { QList result; - if(marked_list.count() > 0) + if (marked_list.count() > 0) { - Q3PtrListIterator 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; } } @@ -828,9 +820,9 @@ void BrowserNode::edit(const char * s, const QStringList & default_stereotypes) // // returns all parents for NON class -Q3PtrList BrowserNode::parents() const +QList BrowserNode::parents() const { - Q3PtrList l; + QList l; Q3ListViewItem * child; for (child = firstChild(); child != 0; child = child->nextSibling()) { @@ -853,30 +845,26 @@ Q3PtrList BrowserNode::parents() const // check inheritance QString BrowserNode::check_inherit(const BrowserNode * new_parent) const { - Q3PtrList all_parents; - Q3PtrList notyet = parents(); + QList all_parents; + QList notyet = parents(); - if (notyet.findRef(new_parent) != -1) + if (notyet.contains(const_cast(new_parent))) return TR("already generalize / realize"); - notyet.append(new_parent); + notyet.append(const_cast(new_parent)); do { - BrowserNode * cl = notyet.getFirst(); - - notyet.removeFirst(); + BrowserNode *cl = notyet.takeFirst(); if (cl == this) return TR("can't have circular generalization / realization"); - if (all_parents.findRef(cl) == -1) { + if (! all_parents.contains(cl)) { all_parents.append(cl); - Q3PtrList 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()); @@ -884,7 +872,7 @@ QString BrowserNode::check_inherit(const BrowserNode * new_parent) const return 0; } -bool BrowserNode::may_contains_them(const Q3PtrList & , +bool BrowserNode::may_contains_them(const QList & , BooL & ) const { //for inheritance @@ -919,17 +907,14 @@ void BrowserNode::mark_menu(Q3PopupMenu & m, const char * s, int bias) const m.setWhatsThis(m.insertItem(TR("Mark"), bias), TR("to mark %1", 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; } @@ -939,20 +924,17 @@ void BrowserNode::mark_menu(Q3PopupMenu & m, const char * s, int bias) const #ifndef SIMPLE_DUPLICATION bool rec = FALSE; #endif - Q3PtrListIterator 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; @@ -967,15 +949,13 @@ void BrowserNode::mark_menu(Q3PopupMenu & m, const char * s, int bias) const bool thisIsntProject = this != BrowserView::get_project(); bool isWritable = true; bool parentCanContain = false; - if(((BrowserNode *) parent()) != 0) - { + 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), @@ -1056,10 +1036,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(bn); @@ -1085,10 +1063,8 @@ 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()) - { + for (int i = marked_list.size() - 1; i >= 0; --i) { + bn = marked_list[i]; //BrowserView::removeItem(p->get_) // BrowserAttribute* asAttribute = ((BrowserAttribute *) bn); // if(p != (BrowserNode *) bn->parent() && asAttribute != 0) @@ -1124,10 +1100,9 @@ void BrowserNode::mark_management(int choice) 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) @@ -1190,10 +1165,10 @@ 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()) + for (int i = marked_list.size() - 1; i >= 0; --i) { + bn = marked_list[i]; p->move(bn->duplicate(p), this); + } } break; #ifndef SIMPLE_DUPLICATION @@ -1206,11 +1181,7 @@ 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(); } @@ -1254,7 +1225,7 @@ void BrowserNode::toggle_mark() { if (is_marked) { is_marked = FALSE; - marked_list.removeRef(this); + marked_list.remove(this); } else { is_marked = TRUE; @@ -1279,13 +1250,10 @@ void BrowserNode::toggle_mark() void BrowserNode::set_marked(bool value) { is_marked = value; - if (value) { + if (value) marked_list.append(this); - } - else { - marked_list.removeRef(this); - - } + else + marked_list.remove(this); //repaint(); @@ -1627,17 +1595,17 @@ 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; @@ -1977,7 +1945,7 @@ void BrowserNode::support_file(Q3Dict & files, bool add) const static QString UnconsistencyDeletedMsg; static QString UnconsistencyFixedMsg; -static Q3PtrList ModifiedPackages; +static QList ModifiedPackages; void BrowserNode::signal_unconsistencies() { @@ -2005,10 +1973,9 @@ void BrowserNode::signal_unconsistencies() 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()) { @@ -2028,7 +1995,7 @@ void BrowserNode::unconsistent_fixed(const char * what, BrowserNode * newone) while (bn->get_type() != UmlPackage) bn = (BrowserNode *) bn->parent(); - if (ModifiedPackages.findRef(bn) == -1) + if (!ModifiedPackages.contains(bn)) ModifiedPackages.append(bn); } @@ -2050,7 +2017,7 @@ void BrowserNodeList::sort_it() BrowserPackage::prepare_for_sort(); - sort(); + qSort(begin(), end(), lessThan); SynonymousPath.setAutoDelete(TRUE); SynonymousPath.clear(); @@ -2059,6 +2026,46 @@ void BrowserNodeList::sort_it() QApplication::restoreOverrideCursor(); } +void BrowserNodeList::sort() +{ + qSort(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) @@ -2109,52 +2116,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 it(*this); - - while (it.current() != 0) { - const char * s = it.current()->get_name(); - + foreach (BrowserNode *node, *this) { + const char * s = node->get_name(); list.append(((s == 0) || (*s == 0)) ? "" : s); - ++it; } } @@ -2162,22 +2130,14 @@ void BrowserNodeList::full_names(QStringList & list) const { list.clear(); - Q3PtrListIterator 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 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 b2c63552e..9950f989a 100644 --- a/src/browser/BrowserNode.h +++ b/src/browser/BrowserNode.h @@ -91,7 +91,7 @@ class BrowserNode : public Q3ListViewItem, static bool show_stereotypes; static unsigned edition_number; - static Q3PtrList marked_list; + static QList marked_list; static bool popup_menu_active; static QList generatable_types; static SaveProgress * save_progress; @@ -137,18 +137,12 @@ class BrowserNode : public Q3ListViewItem, bool markedp() const { return is_marked; } - static const Q3PtrList & marked_nodes() { + static const QList & marked_nodes() { return marked_list; } static const QList get_marked_nodes() { - Q3PtrListIterator it(marked_list); - QList result; - for (; it.current() != 0; ++it) - { - result.append(it.current()); - } - return result; + return marked_list; } static void setup_generatable_types(); @@ -184,7 +178,7 @@ class BrowserNode : public Q3ListViewItem, const char * get_stereotype() const; virtual QString stereotypes_properties() const; bool may_contains(BrowserNode *, bool rec) const; - virtual bool may_contains_them(const Q3PtrList &, + virtual bool may_contains_them(const QList &, BooL & duplicable) const; bool may_contains_it(BrowserNode * bn) const; virtual void move(BrowserNode *, BrowserNode * after); @@ -256,7 +250,7 @@ class BrowserNode : public Q3ListViewItem, 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 parents() const; + virtual QList 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; @@ -266,7 +260,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 &, bool ondelete = FALSE); + virtual void referenced_by(QList &, bool ondelete = FALSE); virtual AType class_association() const; virtual const char * constraint() const; @@ -338,11 +332,8 @@ inline QString BrowserNode::fullname(QString & s, bool rev) const // a sortable list of BrowserNode -class BrowserNodeList : public Q3PtrList +class BrowserNodeList : public QList { -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, @@ -354,6 +345,10 @@ class BrowserNodeList : public Q3PtrList 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/BrowserObjectDiagram.cpp b/src/browser/BrowserObjectDiagram.cpp index 7b9ec9d8d..33ad852e8 100644 --- a/src/browser/BrowserObjectDiagram.cpp +++ b/src/browser/BrowserObjectDiagram.cpp @@ -54,7 +54,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserObjectDiagram::imported; +QList BrowserObjectDiagram::imported; Q3ValueList BrowserObjectDiagram::imported_ids; QStringList BrowserObjectDiagram::its_default_stereotypes; // unicode @@ -156,15 +156,13 @@ void BrowserObjectDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserObjectDiagram * d = imported.take(0); - + foreach (BrowserObjectDiagram *d, imported) { (new ObjectDiagramWindow(d->full_name(), d, *it))->close(TRUE); d->set_diagram_window(nullptr); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserObjectDiagram::renumber(int phase) @@ -546,7 +544,7 @@ bool BrowserObjectDiagram::tool_cmd(ToolCom * com, const char * args) } } -void BrowserObjectDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserObjectDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserObjectDiagram.h b/src/browser/BrowserObjectDiagram.h index a4e8e93df..6cebc0658 100644 --- a/src/browser/BrowserObjectDiagram.h +++ b/src/browser/BrowserObjectDiagram.h @@ -44,7 +44,7 @@ class BrowserObjectDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -116,7 +116,7 @@ class BrowserObjectDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & l, BrowserNode *, const char * kc, char const * kr); }; diff --git a/src/browser/BrowserOperation.cpp b/src/browser/BrowserOperation.cpp index 247a4a046..3ae2869f0 100644 --- a/src/browser/BrowserOperation.cpp +++ b/src/browser/BrowserOperation.cpp @@ -219,7 +219,7 @@ bool BrowserOperation::delete_internal(QString &) is_deleted = TRUE; if (is_marked) { - marked_list.removeRef(this); + marked_list.remove(this); is_marked = FALSE; } @@ -233,7 +233,7 @@ void BrowserOperation::AddConstructorInitalizer() { ConstructorInitializerDialog ciDialog; BrowserClass* container = static_cast(get_container(UmlClass)); - Q3PtrList parents = container->parents(); + QList parents = container->parents(); QString initializerDummy(" : "); for(BrowserNode* parent : parents) { @@ -586,7 +586,7 @@ void BrowserOperation::paintCell(QPainter * p, const QColorGroup & cg, int colum } } -static Q3PtrList ImplBy; +static QList ImplBy; static const int add_constructor_initializer = 35; static const int go_up = 36; @@ -664,10 +664,9 @@ void BrowserOperation::menu() MenuFactory::createTitle(implbym, TR("Choose behavior")); implbym.insertSeparator(); - BrowserNode * beh; int rank = 10000; - for (beh = ImplBy.first(); beh != 0; beh = ImplBy.next()) + foreach (BrowserNode * beh, ImplBy) implbym.insertItem(beh->full_name(TRUE), rank); } @@ -950,7 +949,7 @@ void BrowserOperation::member_cpp_def(const QString & prefix, } } -void BrowserOperation::compute_referenced_by(Q3PtrList & l, +void BrowserOperation::compute_referenced_by(QList & l, BrowserClass * target) { IdIterator it(all); @@ -963,7 +962,7 @@ void BrowserOperation::compute_referenced_by(Q3PtrList & l, } } -void BrowserOperation::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserOperation::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -1003,16 +1002,14 @@ bool BrowserOperation::tool_cmd(ToolCom * com, const char * args) return TRUE; case sideCmd: { - Q3PtrList l; + QList 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); } diff --git a/src/browser/BrowserOperation.h b/src/browser/BrowserOperation.h index 712f89567..4d2c94f78 100644 --- a/src/browser/BrowserOperation.h +++ b/src/browser/BrowserOperation.h @@ -127,8 +127,8 @@ class BrowserOperation : public BrowserNode, public Labeled virtual void renumber(int phase); virtual void prepare_update_lib() const; - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserClass *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserClass *); static QString python_init_self(BrowserNode * cl); diff --git a/src/browser/BrowserPackage.cpp b/src/browser/BrowserPackage.cpp index c5db30282..38795422e 100644 --- a/src/browser/BrowserPackage.cpp +++ b/src/browser/BrowserPackage.cpp @@ -101,7 +101,7 @@ #include "translate.h" IdDict BrowserPackage::all(__FILE__); -Q3PtrList BrowserPackage::removed; +QList BrowserPackage::removed; QStringList BrowserPackage::its_default_stereotypes; // unicode QStringList BrowserPackage::relation_default_stereotypes; // unicode @@ -419,7 +419,7 @@ void BrowserPackage::support_file(Q3Dict & files, bool add) const ((BrowserNode *) child)->support_file(files, add); } -void BrowserPackage::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserPackage::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -2035,13 +2035,11 @@ void BrowserPackage::DragMoveInsideEvent(QDragMoveEvent * e) e->ignore(); } -bool BrowserPackage::may_contains_them(const Q3PtrList & l, +bool BrowserPackage::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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 +2048,14 @@ bool BrowserPackage::may_contains_them(const Q3PtrList & 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; } @@ -2592,13 +2590,11 @@ void BrowserPackage::save_session(QTextStream & st) QString warning; if (! marked_list.isEmpty()) { - Q3PtrListIterator 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'; } diff --git a/src/browser/BrowserPackage.h b/src/browser/BrowserPackage.h index df31f4984..88d6f14cf 100644 --- a/src/browser/BrowserPackage.h +++ b/src/browser/BrowserPackage.h @@ -48,7 +48,7 @@ class BrowserPackage : public BrowserNode, public Labeled friend class StereotypesDialog; protected: - static Q3PtrList removed; + static QList removed; static IdDict all; static QStringList its_default_stereotypes; @@ -115,7 +115,7 @@ class BrowserPackage : public BrowserNode, public Labeled virtual QString get_stype() const; virtual int get_identifier() const; virtual const char * help_topic() const; - virtual bool may_contains_them(const Q3PtrList &, + virtual bool may_contains_them(const QList &, BooL & duplicable) const; virtual BasicData * get_data() const; virtual const QStringList & default_stereotypes(UmlCode, const BrowserNode *) const; // non class rel @@ -134,7 +134,7 @@ class BrowserPackage : public BrowserNode, public Labeled virtual QString check_inherit(const BrowserNode * parent) const; QString may_connect(UmlCode & l, const BrowserNode * dest) const; - virtual void referenced_by(Q3PtrList & l, bool ondelete); + virtual void referenced_by(QList & l, bool ondelete); virtual bool tool_cmd(ToolCom * com, const char * args); static bool tool_global_cmd(ToolCom * com, const char * args); diff --git a/src/browser/BrowserParameter.cpp b/src/browser/BrowserParameter.cpp index 2af86da64..95fd0f641 100644 --- a/src/browser/BrowserParameter.cpp +++ b/src/browser/BrowserParameter.cpp @@ -336,7 +336,7 @@ QString BrowserParameter::full_name(bool rev, bool) const return fullname(rev); } -void BrowserParameter::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserParameter::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserFlow::compute_referenced_by(l, this); @@ -345,7 +345,7 @@ void BrowserParameter::referenced_by(Q3PtrList & l, bool ondelete) BrowserActivityDiagram::compute_referenced_by(l, this, "parametercanvas", "parameter_ref"); } -void BrowserParameter::compute_referenced_by(Q3PtrList & l, +void BrowserParameter::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); diff --git a/src/browser/BrowserParameter.h b/src/browser/BrowserParameter.h index 156254892..b71fbad07 100644 --- a/src/browser/BrowserParameter.h +++ b/src/browser/BrowserParameter.h @@ -90,8 +90,8 @@ class BrowserParameter : public BrowserNode, public Labeled, p virtual void renumber(int phase); virtual void prepare_update_lib() const; - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, 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..bbfadee85 100644 --- a/src/browser/BrowserParameterSet.cpp +++ b/src/browser/BrowserParameterSet.cpp @@ -118,7 +118,7 @@ void BrowserParameterSet::prepare_update_lib() const all.memo_id_oid(get_ident(), original_id); } -void BrowserParameterSet::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserParameterSet::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); diff --git a/src/browser/BrowserParameterSet.h b/src/browser/BrowserParameterSet.h index 1e92c9873..6fc963889 100644 --- a/src/browser/BrowserParameterSet.h +++ b/src/browser/BrowserParameterSet.h @@ -81,7 +81,7 @@ class BrowserParameterSet : public BrowserNode, public Labeled & l, bool ondelete); + virtual void referenced_by(QList & 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..ac09b4cd5 100644 --- a/src/browser/BrowserPin.cpp +++ b/src/browser/BrowserPin.cpp @@ -139,7 +139,7 @@ const QPixmap * BrowserPin::pixmap(int) const return PinIcon; } -void BrowserPin::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserPin::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -147,7 +147,7 @@ void BrowserPin::referenced_by(Q3PtrList & l, bool ondelete) BrowserActivityDiagram::compute_referenced_by(l, this, "pincanvas", "pin_ref"); } -void BrowserPin::compute_referenced_by(Q3PtrList & l, +void BrowserPin::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); diff --git a/src/browser/BrowserPin.h b/src/browser/BrowserPin.h index d6178845a..18be94fbb 100644 --- a/src/browser/BrowserPin.h +++ b/src/browser/BrowserPin.h @@ -97,8 +97,8 @@ class BrowserPin : public BrowserNode, public Labeled, public Browse virtual bool tool_cmd(ToolCom * com, const char * args); virtual bool api_compatible(unsigned v) const; - virtual void referenced_by(Q3PtrList & l, bool ondelete); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList & l, bool ondelete); + static void compute_referenced_by(QList &, 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..378cc0b7a 100644 --- a/src/browser/BrowserPseudoState.cpp +++ b/src/browser/BrowserPseudoState.cpp @@ -122,7 +122,7 @@ void BrowserPseudoState::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserPseudoState::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserPseudoState::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserTransition::compute_referenced_by(l, this); diff --git a/src/browser/BrowserPseudoState.h b/src/browser/BrowserPseudoState.h index f878445d8..298d6bae4 100644 --- a/src/browser/BrowserPseudoState.h +++ b/src/browser/BrowserPseudoState.h @@ -96,8 +96,8 @@ class BrowserPseudoState : public BrowserNode, public Labeled &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserPseudoState *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, 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..2c3f2945d 100644 --- a/src/browser/BrowserRegion.cpp +++ b/src/browser/BrowserRegion.cpp @@ -414,13 +414,11 @@ bool BrowserRegion::tool_cmd(ToolCom * com, const char * args) } } -bool BrowserRegion::may_contains_them(const Q3PtrList & l, +bool BrowserRegion::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { - switch (it.current()->get_type()) { + foreach (BrowserNode *node, l) { + switch (node->get_type()) { case UmlState: break; @@ -435,16 +433,16 @@ bool BrowserRegion::may_contains_them(const Q3PtrList & 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; diff --git a/src/browser/BrowserRegion.h b/src/browser/BrowserRegion.h index d3713283b..86ce81002 100644 --- a/src/browser/BrowserRegion.h +++ b/src/browser/BrowserRegion.h @@ -61,7 +61,7 @@ class BrowserRegion : public BrowserNode, public Labeled BrowserRegion(const BrowserRegion * model, BrowserNode * p); virtual ~BrowserRegion(); - virtual bool may_contains_them(const Q3PtrList & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; static BrowserRegion * add_region(BrowserNode * future_parent, const char * s = "region"); diff --git a/src/browser/BrowserRelation.cpp b/src/browser/BrowserRelation.cpp index 14b888c06..dafb16c1b 100644 --- a/src/browser/BrowserRelation.cpp +++ b/src/browser/BrowserRelation.cpp @@ -61,7 +61,7 @@ #include "translate.h" IdDict BrowserRelation::all(1021, __FILE__); -static Q3PtrList Unconsistent; +static QList Unconsistent; BrowserRelation::BrowserRelation(BrowserNode * p, RelationData * d, int id) : BrowserNode(d->get_name(), p), Labeled(all, id), @@ -214,7 +214,7 @@ UmlVisibility BrowserRelation::get_visibility() const return def->get_uml_visibility_a(); } -void BrowserRelation::compute_referenced_by(Q3PtrList & l, +void BrowserRelation::compute_referenced_by(QList & l, BrowserClass * target) { IdIterator it(all); @@ -232,7 +232,7 @@ void BrowserRelation::compute_referenced_by(Q3PtrList & l, } } -void BrowserRelation::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserRelation::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserClassInstance::compute_referenced_by(l, this); @@ -1000,12 +1000,12 @@ 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 it2(all); diff --git a/src/browser/BrowserRelation.h b/src/browser/BrowserRelation.h index 72433537f..162d0ff06 100644 --- a/src/browser/BrowserRelation.h +++ b/src/browser/BrowserRelation.h @@ -125,8 +125,8 @@ friend class QuickEdit; virtual void renumber(int phase); virtual void prepare_update_lib() const; - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserClass *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserClass *); virtual bool tool_cmd(ToolCom * com, const char * args); diff --git a/src/browser/BrowserSeqDiagram.cpp b/src/browser/BrowserSeqDiagram.cpp index ce6d754f7..371f7826a 100644 --- a/src/browser/BrowserSeqDiagram.cpp +++ b/src/browser/BrowserSeqDiagram.cpp @@ -53,7 +53,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserSeqDiagram::imported; +QList BrowserSeqDiagram::imported; Q3ValueList BrowserSeqDiagram::imported_ids; QStringList BrowserSeqDiagram::its_default_stereotypes; // unicode QStringList BrowserSeqDiagram::message_default_stereotypes; // unicode @@ -160,14 +160,12 @@ void BrowserSeqDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserSeqDiagram * d = imported.take(0); - + foreach (BrowserSeqDiagram *d, imported) { (new SeqDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserSeqDiagram::renumber(int phase) @@ -575,7 +573,7 @@ bool BrowserSeqDiagram::tool_cmd(ToolCom * com, const char * args) } } -void BrowserSeqDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserSeqDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserSeqDiagram.h b/src/browser/BrowserSeqDiagram.h index 28a988b3a..7c29f6a43 100644 --- a/src/browser/BrowserSeqDiagram.h +++ b/src/browser/BrowserSeqDiagram.h @@ -44,7 +44,7 @@ class BrowserSeqDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; static QStringList message_default_stereotypes; @@ -122,7 +122,7 @@ class BrowserSeqDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & l, BrowserNode *, const char * kc, char const * kr); }; diff --git a/src/browser/BrowserSimpleRelation.cpp b/src/browser/BrowserSimpleRelation.cpp index a5b19b020..09eed61f2 100644 --- a/src/browser/BrowserSimpleRelation.cpp +++ b/src/browser/BrowserSimpleRelation.cpp @@ -151,7 +151,7 @@ bool BrowserSimpleRelation::undelete(bool, QString & warning, QString & renamed) return TRUE; } -void BrowserSimpleRelation::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserSimpleRelation::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -168,7 +168,7 @@ void BrowserSimpleRelation::referenced_by(Q3PtrList & l, bool ondel } } -void BrowserSimpleRelation::compute_referenced_by(Q3PtrList & l, +void BrowserSimpleRelation::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); diff --git a/src/browser/BrowserSimpleRelation.h b/src/browser/BrowserSimpleRelation.h index 57cb94ab3..d15da87dc 100644 --- a/src/browser/BrowserSimpleRelation.h +++ b/src/browser/BrowserSimpleRelation.h @@ -86,8 +86,8 @@ class BrowserSimpleRelation : public BrowserNode, public Labeled & l, bool ondelete); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList & l, bool ondelete); + static void compute_referenced_by(QList &, BrowserNode *); virtual bool tool_cmd(ToolCom * com, const char * args); diff --git a/src/browser/BrowserState.cpp b/src/browser/BrowserState.cpp index f5cda2dff..ade5158e2 100644 --- a/src/browser/BrowserState.cpp +++ b/src/browser/BrowserState.cpp @@ -129,7 +129,7 @@ void BrowserState::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserState::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserState::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserTransition::compute_referenced_by(l, this); @@ -151,7 +151,7 @@ void BrowserState::referenced_by(Q3PtrList & l, bool ondelete) } // callers suppose this only take specification into acount -void BrowserState::compute_referenced_by(Q3PtrList & l, +void BrowserState::compute_referenced_by(QList & l, BrowserOperation * op) { IdIterator it(all); @@ -754,14 +754,13 @@ BrowserState * BrowserState::get_machine(const BrowserNode * bn) } } -bool BrowserState::may_contains_them(const Q3PtrList & l, +bool BrowserState::may_contains_them(const QList & l, BooL & duplicable) const { BrowserNode * machine = get_machine(this); - Q3PtrListIterator 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 +786,7 @@ bool BrowserState::may_contains_them(const Q3PtrList & l, // no break case EntryPointPS: case ExitPointPS: - if (get_machine(it.current()) != machine) + if (get_machine(node) != machine) return FALSE; break; @@ -796,10 +795,10 @@ bool BrowserState::may_contains_them(const Q3PtrList & 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; diff --git a/src/browser/BrowserState.h b/src/browser/BrowserState.h index 5ccee0cfc..30da590cf 100644 --- a/src/browser/BrowserState.h +++ b/src/browser/BrowserState.h @@ -65,7 +65,7 @@ class BrowserState : public BrowserNode, public Labeled virtual ~BrowserState(); bool may_contains(UmlCode k) const; - virtual bool may_contains_them(const Q3PtrList & l, + virtual bool may_contains_them(const QList & l, BooL & duplicable) const; virtual BrowserNode * duplicate(BrowserNode * p, QString name = QString()); @@ -107,8 +107,8 @@ class BrowserState : public BrowserNode, public Labeled virtual bool tool_cmd(ToolCom * com, const char * args); virtual bool api_compatible(unsigned v) const; - virtual void referenced_by(Q3PtrList &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserOperation *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserOperation *); bool is_ref() const; bool can_reference() const; diff --git a/src/browser/BrowserStateAction.cpp b/src/browser/BrowserStateAction.cpp index d60a48571..83b3cae35 100644 --- a/src/browser/BrowserStateAction.cpp +++ b/src/browser/BrowserStateAction.cpp @@ -119,7 +119,7 @@ void BrowserStateAction::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserStateAction::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserStateAction::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); BrowserTransition::compute_referenced_by(l, this); diff --git a/src/browser/BrowserStateAction.h b/src/browser/BrowserStateAction.h index b75313dd1..ba3cab456 100644 --- a/src/browser/BrowserStateAction.h +++ b/src/browser/BrowserStateAction.h @@ -92,8 +92,8 @@ class BrowserStateAction : public BrowserNode, public Labeled &, bool ondelete = FALSE); - static void compute_referenced_by(Q3PtrList &, BrowserStateAction *); + virtual void referenced_by(QList &, bool ondelete = FALSE); + static void compute_referenced_by(QList &, BrowserStateAction *); bool allow_empty() const; diff --git a/src/browser/BrowserStateDiagram.cpp b/src/browser/BrowserStateDiagram.cpp index aa55cb461..0fe18053d 100644 --- a/src/browser/BrowserStateDiagram.cpp +++ b/src/browser/BrowserStateDiagram.cpp @@ -55,7 +55,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserStateDiagram::imported; +QList BrowserStateDiagram::imported; Q3ValueList BrowserStateDiagram::imported_ids; QStringList BrowserStateDiagram::its_default_stereotypes; // unicode @@ -151,14 +151,12 @@ void BrowserStateDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserStateDiagram * d = imported.take(0); - + foreach (BrowserStateDiagram *d, imported) { (new StateDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserStateDiagram::renumber(int phase) @@ -592,7 +590,7 @@ const QStringList & BrowserStateDiagram::default_stereotypes() return its_default_stereotypes; } -void BrowserStateDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserStateDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserStateDiagram.h b/src/browser/BrowserStateDiagram.h index b32b850cd..46e837af7 100644 --- a/src/browser/BrowserStateDiagram.h +++ b/src/browser/BrowserStateDiagram.h @@ -45,7 +45,7 @@ class BrowserStateDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -117,7 +117,7 @@ class BrowserStateDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & 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..9fd5e5c22 100644 --- a/src/browser/BrowserTransition.cpp +++ b/src/browser/BrowserTransition.cpp @@ -128,7 +128,7 @@ bool BrowserTransition::undelete(bool, QString & warning, QString & renamed) return TRUE; } -void BrowserTransition::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserTransition::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -136,7 +136,7 @@ void BrowserTransition::referenced_by(Q3PtrList & l, bool ondelete) BrowserStateDiagram::compute_referenced_by(l, this, "transitioncanvas", "transition_ref"); } -void BrowserTransition::compute_referenced_by(Q3PtrList & l, +void BrowserTransition::compute_referenced_by(QList & l, BrowserNode * target) { IdIterator it(all); diff --git a/src/browser/BrowserTransition.h b/src/browser/BrowserTransition.h index 5646a9d41..b390935fb 100644 --- a/src/browser/BrowserTransition.h +++ b/src/browser/BrowserTransition.h @@ -88,8 +88,8 @@ class BrowserTransition : public BrowserNode, public Labeled virtual void renumber(int phase); virtual void prepare_update_lib() const; - virtual void referenced_by(Q3PtrList & l, bool ondelete); - static void compute_referenced_by(Q3PtrList &, BrowserNode *); + virtual void referenced_by(QList & l, bool ondelete); + static void compute_referenced_by(QList &, BrowserNode *); virtual bool tool_cmd(ToolCom * com, const char * args); diff --git a/src/browser/BrowserUseCase.cpp b/src/browser/BrowserUseCase.cpp index 1d51f6275..29ec99af5 100644 --- a/src/browser/BrowserUseCase.cpp +++ b/src/browser/BrowserUseCase.cpp @@ -174,7 +174,7 @@ void BrowserUseCase::prepare_update_lib() const ((BrowserNode *) child)->prepare_update_lib(); } -void BrowserUseCase::referenced_by(Q3PtrList & l, bool ondelete) +void BrowserUseCase::referenced_by(QList & l, bool ondelete) { BrowserNode::referenced_by(l, ondelete); @@ -961,13 +961,11 @@ void BrowserUseCase::DragMoveInsideEvent(QDragMoveEvent * e) e->ignore(); } -bool BrowserUseCase::may_contains_them(const Q3PtrList & l, +bool BrowserUseCase::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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 +979,17 @@ bool BrowserUseCase::may_contains_them(const Q3PtrList & 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; diff --git a/src/browser/BrowserUseCase.h b/src/browser/BrowserUseCase.h index c579b4013..b98eff995 100644 --- a/src/browser/BrowserUseCase.h +++ b/src/browser/BrowserUseCase.h @@ -101,7 +101,7 @@ class BrowserUseCase : public BrowserNode, public Labeled virtual int get_identifier() const; virtual const char * help_topic() const; virtual void modified(); - virtual bool may_contains_them(const Q3PtrList &, + virtual bool may_contains_them(const QList &, BooL & duplicable) const; virtual BasicData * get_data() const; virtual void get_usecasediagramsettings(UseCaseDiagramSettings &) const; @@ -129,7 +129,7 @@ class BrowserUseCase : public BrowserNode, public Labeled static void read_stereotypes(char *& , char *& k); static void save_stereotypes(QTextStream &); - virtual void referenced_by(Q3PtrList & l, bool ondelete); + virtual void referenced_by(QList & 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..b44d75e46 100644 --- a/src/browser/BrowserUseCaseDiagram.cpp +++ b/src/browser/BrowserUseCaseDiagram.cpp @@ -55,7 +55,7 @@ #include "mu.h" #include "translate.h" -Q3PtrList BrowserUseCaseDiagram::imported; +QList BrowserUseCaseDiagram::imported; Q3ValueList BrowserUseCaseDiagram::imported_ids; QStringList BrowserUseCaseDiagram::its_default_stereotypes; // unicode @@ -160,14 +160,12 @@ void BrowserUseCaseDiagram::import() { Q3ValueList::Iterator it = imported_ids.begin(); - while (!imported.isEmpty()) { - QString warning; - BrowserUseCaseDiagram * d = imported.take(0); - + foreach (BrowserUseCaseDiagram *d, imported) { (new UseCaseDiagramWindow(d->full_name(), d, *it))->close(TRUE); it = imported_ids.remove(it); d->is_modified = TRUE; } + imported.clear(); } void BrowserUseCaseDiagram::renumber(int phase) @@ -570,7 +568,7 @@ bool BrowserUseCaseDiagram::tool_cmd(ToolCom * com, const char * args) } } -void BrowserUseCaseDiagram::compute_referenced_by(Q3PtrList & l, +void BrowserUseCaseDiagram::compute_referenced_by(QList & l, BrowserNode * bn, char const * kc, char const * kr) diff --git a/src/browser/BrowserUseCaseDiagram.h b/src/browser/BrowserUseCaseDiagram.h index 9e0474e92..b87e5a59e 100644 --- a/src/browser/BrowserUseCaseDiagram.h +++ b/src/browser/BrowserUseCaseDiagram.h @@ -44,7 +44,7 @@ class BrowserUseCaseDiagram : public BrowserDiagram friend class StereotypesDialog; protected: - static Q3PtrList imported; + static QList imported; static Q3ValueList imported_ids; static QStringList its_default_stereotypes; @@ -114,7 +114,7 @@ class BrowserUseCaseDiagram : public BrowserDiagram static void open_all(); static void import(); - static void compute_referenced_by(Q3PtrList & l, BrowserNode *, + static void compute_referenced_by(QList & l, BrowserNode *, const char * kc, char const * kr); }; diff --git a/src/browser/BrowserUseCaseView.cpp b/src/browser/BrowserUseCaseView.cpp index 507b843fc..9e8a8a28f 100644 --- a/src/browser/BrowserUseCaseView.cpp +++ b/src/browser/BrowserUseCaseView.cpp @@ -830,13 +830,11 @@ void BrowserUseCaseView::DragMoveInsideEvent(QDragMoveEvent * e) e->ignore(); } -bool BrowserUseCaseView::may_contains_them(const Q3PtrList & l, +bool BrowserUseCaseView::may_contains_them(const QList & l, BooL & duplicable) const { - Q3PtrListIterator 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 & 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 & l, return FALSE; } - duplicable = may_contains_it(it.current()); + duplicable = may_contains_it(node); } return TRUE; diff --git a/src/browser/BrowserUseCaseView.h b/src/browser/BrowserUseCaseView.h index 24dfa6978..0d9b810e6 100644 --- a/src/browser/BrowserUseCaseView.h +++ b/src/browser/BrowserUseCaseView.h @@ -95,7 +95,7 @@ class BrowserUseCaseView : public BrowserNode, public Labeled &, + virtual bool may_contains_them(const QList &, BooL & duplicable) const; virtual BrowserNode * container(UmlCode) const; // container for class, state machine and activity virtual BasicData * get_data() const; diff --git a/src/data/BasicData.cpp b/src/data/BasicData.cpp index 0f075d5de..1c15b712b 100644 --- a/src/data/BasicData.cpp +++ b/src/data/BasicData.cpp @@ -54,7 +54,7 @@ void BasicParent::removeChild(QObject *) // -Q3PtrList BasicData::removed; +QList BasicData::removed; BasicData::BasicData(const BasicData * model) : QObject(&BasicParent::the), browser_node(0) @@ -81,16 +81,14 @@ void BasicData::undelete(QString &, QString &) if (deletedp()) { set_deletedp(FALSE); emit changed(); - removed.removeRef(this); + removed.remove(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..781f8cb52 100644 --- a/src/data/BasicData.h +++ b/src/data/BasicData.h @@ -67,7 +67,7 @@ class BasicData : public QObject Q_OBJECT protected: - static Q3PtrList removed; + static QList removed; WrapperStr stereotype; BrowserNode * browser_node; diff --git a/src/data/ClassData.cpp b/src/data/ClassData.cpp index cc832395a..1aad9f15b 100644 --- a/src/data/ClassData.cpp +++ b/src/data/ClassData.cpp @@ -100,11 +100,9 @@ ClassData::ClassData(const ClassData * model, BrowserNode * bn) formals[index] = mformals[index]; } - Q3PtrListIterator 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(); @@ -183,33 +181,30 @@ void ClassData::inherit_or_instantiate(BrowserClass *) } void ClassData::update_actuals(BrowserClass * parent, - Q3PtrList & new_actuals, - Q3PtrList & managed) + QList & new_actuals, + QList & 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 +232,16 @@ void ClassData::update_actuals() if (DontUpdateActuals) return; - // an inherited parent was modified/deleted, updates all actuals - Q3PtrList parents = browser_node->parents(); - Q3PtrList new_actuals; - Q3PtrList managed; - BrowserClass * parent; + QList new_actuals; + QList 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 +253,19 @@ void ClassData::update_actuals() emit actuals_changed(); } -void ClassData::get_actuals(Q3PtrList & l, BrowserClass * parent) +void ClassData::get_actuals(QList & 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 +273,10 @@ void ClassData::get_actuals(Q3PtrList & 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 +285,18 @@ void ClassData::get_actuals(Q3PtrList & l, BrowserClass * paren // returns the actuals forms associated to inheritence of 'parent' QString ClassData::get_actuals(BrowserClass * parent) { - Q3PtrList l; + QList l; get_actuals(l, parent); - Q3PtrList 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()) { @@ -526,11 +509,9 @@ bool ClassData::reference(BrowserClass * target) const (formals[i].get_extends().type == target)) return TRUE; - Q3PtrListIterator 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; } @@ -803,7 +784,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); @@ -840,7 +821,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; @@ -1031,10 +1012,9 @@ void ClassData::save(QTextStream & st, QString & warning) const if (actuals.count() != 0) { st << "nactuals " << actuals.count(); - Q3PtrListIterator 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 9b38e2868..981ec8b62 100644 --- a/src/data/ClassData.h +++ b/src/data/ClassData.h @@ -54,7 +54,7 @@ class ClassData : public BasicData protected: WrapperStr constraint; FormalParamData * formals; // remark : do NOT use QArray - Q3PtrList actuals; + QList actuals; AType base_type; // typedef unsigned char nformals; bool is_deleted : 1; @@ -105,9 +105,9 @@ class ClassData : public BasicData virtual void send_idl_def(ToolCom * com); void update_actuals(BrowserClass *, - Q3PtrList & new_actuals, - Q3PtrList & managed); - void get_actuals(Q3PtrList & l, BrowserClass * parent); + QList & new_actuals, + QList & managed); + void get_actuals(QList & l, BrowserClass * parent); public: ClassData(); diff --git a/src/data/ClassInstanceData.cpp b/src/data/ClassInstanceData.cpp index 3c82652bb..b0ab3cd5c 100644 --- a/src/data/ClassInstanceData.cpp +++ b/src/data/ClassInstanceData.cpp @@ -141,7 +141,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,7 +163,7 @@ void ClassInstanceData::check() browser_node->delete_it(); else if (!attributes.isEmpty() || !relations.isEmpty()) { bool modif = FALSE; - Q3PtrList l; + QList l; cl->get_all_parents(l); l.append(cl); @@ -176,7 +176,7 @@ void ClassInstanceData::check() 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); modif = TRUE; @@ -185,7 +185,7 @@ void ClassInstanceData::check() // 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())); @@ -215,7 +215,7 @@ void ClassInstanceData::check() it_rel = relations.remove(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 @@ -245,7 +245,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 +253,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())); @@ -293,10 +293,10 @@ void ClassInstanceData::check_rels() remove = TRUE; } else if (cl != other) { - Q3PtrList l; + QList l; cl->get_all_parents(l); - remove |= (l.findRef(other) == -1); + remove |= (! l.contains(other)); } } @@ -361,7 +361,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 +374,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())); @@ -410,7 +410,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 +428,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())); @@ -491,8 +491,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(); @@ -553,13 +554,13 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args, if (! find) { // add it - Q3PtrList l; + QList 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; @@ -610,13 +611,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; @@ -640,13 +640,12 @@ bool ClassInstanceData::tool_cmd(ToolCom * com, const char * args, } else { // get all available relations - Q3PtrList l; - BrowserRelation * r; + QList 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); } } @@ -687,11 +686,11 @@ bool ClassInstanceData::change_rel(ToolCom * com, const char * args, if (isadd) { if (it == relations.end()) { // not yet present - Q3PtrList l; + QList 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); diff --git a/src/data/ClassInstanceData.h b/src/data/ClassInstanceData.h index a937677ec..91b089554 100644 --- a/src/data/ClassInstanceData.h +++ b/src/data/ClassInstanceData.h @@ -75,7 +75,7 @@ class ClassInstanceData : public SimpleData BrowserClass * cl; // type of instance Q3ValueList attributes; Q3ValueList relations; - Q3PtrList connect_list; // ClassData and ClassInstanceData + QList connect_list; // ClassData and ClassInstanceData protected: virtual void send_uml_def(ToolCom * com, BrowserNode * bn, diff --git a/src/data/RelationData.cpp b/src/data/RelationData.cpp index e5c1ecc9f..79e624aae 100644 --- a/src/data/RelationData.cpp +++ b/src/data/RelationData.cpp @@ -52,10 +52,10 @@ #include "Logging/QsLog.h" IdDict RelationData::all(1023, __FILE__); -Q3PtrList RelationData::Unconsistent; +QList RelationData::Unconsistent; // file format < 56 -static Q3PtrList IncludeToHeaderIfExternal; +static QList IncludeToHeaderIfExternal; RelationData::RelationData(UmlCode e, int id) : Labeled(all, id), is_deleted(FALSE), is_unconsistent(FALSE), type(e) @@ -1783,9 +1783,7 @@ void RelationData::set_unconsistent() void RelationData::delete_unconsistent() { - while (! Unconsistent.isEmpty()) { - RelationData * d = Unconsistent.take(0); - + foreach (RelationData *d, Unconsistent) { d->SetStart(0); d->SetEnd(0); if (!d->deletedp()) @@ -1793,6 +1791,7 @@ void RelationData::delete_unconsistent() delete d; } + Unconsistent.clear(); } // for file < 56, modify import from source to header @@ -1800,14 +1799,13 @@ 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->a.cpp_decl = "#include in header"; } + IncludeToHeaderIfExternal.clear(); } void RelationData::IndexStartEnd() diff --git a/src/data/RelationData.h b/src/data/RelationData.h index dde1d137c..72c7f8b32 100644 --- a/src/data/RelationData.h +++ b/src/data/RelationData.h @@ -94,7 +94,7 @@ class RelationData : public ClassMemberData, public Labeled protected: static IdDict all; - static Q3PtrList Unconsistent; + static QList Unconsistent; // Uml bool is_deleted : 8; // 1 useless here, 8 faster than 1 ? diff --git a/src/diagram/ActivityActionCanvas.cpp b/src/diagram/ActivityActionCanvas.cpp index f35dc6ea5..8750698d2 100644 --- a/src/diagram/ActivityActionCanvas.cpp +++ b/src/diagram/ActivityActionCanvas.cpp @@ -1043,7 +1043,7 @@ bool ActivityActionCanvas::has_drawing_settings() const return TRUE; } -void ActivityActionCanvas::edit_drawing_settings(Q3PtrList & l) +void ActivityActionCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(1); @@ -1062,18 +1062,17 @@ void ActivityActionCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/ActivityActionCanvas.h b/src/diagram/ActivityActionCanvas.h index ed0f15ac0..4d0bd6eb0 100644 --- a/src/diagram/ActivityActionCanvas.h +++ b/src/diagram/ActivityActionCanvas.h @@ -115,7 +115,7 @@ class ActivityActionCanvas : public QObject, public DiagramCanvas virtual void moveBy(double dx, double dy); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/ActivityCanvas.cpp b/src/diagram/ActivityCanvas.cpp index d271469ff..25f4e173a 100644 --- a/src/diagram/ActivityCanvas.cpp +++ b/src/diagram/ActivityCanvas.cpp @@ -783,7 +783,7 @@ bool ActivityCanvas::has_drawing_settings() const return TRUE; } -void ActivityCanvas::edit_drawing_settings(Q3PtrList & l) +void ActivityCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(2); @@ -802,19 +802,18 @@ void ActivityCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/ActivityCanvas.h b/src/diagram/ActivityCanvas.h index bfac5dc8f..0d6f24bf8 100644 --- a/src/diagram/ActivityCanvas.h +++ b/src/diagram/ActivityCanvas.h @@ -107,7 +107,7 @@ class ActivityCanvas : public QObject, public ActivityContainerCanvas virtual void moveBy(double dx, double dy); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); diff --git a/src/diagram/ActivityDiagramView.cpp b/src/diagram/ActivityDiagramView.cpp index d0a508b5f..6c6f7e13b 100644 --- a/src/diagram/ActivityDiagramView.cpp +++ b/src/diagram/ActivityDiagramView.cpp @@ -771,7 +771,6 @@ void ActivityDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -781,7 +780,7 @@ 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()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlActivity: case UmlInterruptibleActivityRegion: @@ -815,7 +814,7 @@ void ActivityDiagramView::save(QTextStream & st, QString & warning, // then saves relations - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlFlow: case UmlDependOn: @@ -829,7 +828,7 @@ void ActivityDiagramView::save(QTextStream & st, QString & warning, // then saves anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); diff --git a/src/diagram/ActivityObjectCanvas.cpp b/src/diagram/ActivityObjectCanvas.cpp index ebdf17bd0..6fa473d27 100644 --- a/src/diagram/ActivityObjectCanvas.cpp +++ b/src/diagram/ActivityObjectCanvas.cpp @@ -671,7 +671,7 @@ bool ActivityObjectCanvas::has_drawing_settings() const return TRUE; } -void ActivityObjectCanvas::edit_drawing_settings(Q3PtrList & l) +void ActivityObjectCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(1); @@ -690,18 +690,17 @@ void ActivityObjectCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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() } } diff --git a/src/diagram/ActivityObjectCanvas.h b/src/diagram/ActivityObjectCanvas.h index 0bcf499f7..abc904b21 100644 --- a/src/diagram/ActivityObjectCanvas.h +++ b/src/diagram/ActivityObjectCanvas.h @@ -86,7 +86,7 @@ class ActivityObjectCanvas : public QObject, public DiagramCanvas virtual void remove(bool from_model); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); diff --git a/src/diagram/ActivityPartitionCanvas.cpp b/src/diagram/ActivityPartitionCanvas.cpp index fdc45485c..2b5484adc 100644 --- a/src/diagram/ActivityPartitionCanvas.cpp +++ b/src/diagram/ActivityPartitionCanvas.cpp @@ -605,7 +605,7 @@ bool ActivityPartitionCanvas::has_drawing_settings() const return TRUE; } -void ActivityPartitionCanvas::edit_drawing_settings(Q3PtrList & l) +void ActivityPartitionCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -618,11 +618,10 @@ void ActivityPartitionCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/ActivityPartitionCanvas.h b/src/diagram/ActivityPartitionCanvas.h index 879b1c91f..b81d826e4 100644 --- a/src/diagram/ActivityPartitionCanvas.h +++ b/src/diagram/ActivityPartitionCanvas.h @@ -86,7 +86,7 @@ class ActivityPartitionCanvas : public QObject, public ActivityContainerCanvas virtual void change_scale(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/ArrowCanvas.cpp b/src/diagram/ArrowCanvas.cpp index 3f64a2bcd..bbd060fbe 100644 --- a/src/diagram/ArrowCanvas.cpp +++ b/src/diagram/ArrowCanvas.cpp @@ -508,12 +508,8 @@ void ArrowCanvas::go_up(double nz) a->label->setZ(nz); } - Q3PtrListIterator 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)) @@ -1343,7 +1339,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 olines = other->lines; + QList olines = other->lines; LabelCanvas * olabel = other->label; LabelCanvas * ostereotype = other->stereotype; @@ -1361,9 +1357,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,6 +1369,7 @@ 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)); @@ -2202,34 +2197,26 @@ void ArrowCanvas::history_hide() // -Q3PtrList ArrowCanvas::RelsToDel; +QList ArrowCanvas::RelsToDel; void ArrowCanvas::post_load() { - while (! RelsToDel.isEmpty()) { - ArrowCanvas * ar = RelsToDel.take(0); - + foreach (ArrowCanvas *ar, RelsToDel) if (ar->visible()) ar->delete_it(); - } + RelsToDel.clear(); } // to remove redondant relation made by release 2.22 -Q3PtrList ArrowCanvas::RelsToCheck; +QList ArrowCanvas::RelsToCheck; void ArrowCanvas::remove_redondant_rels() { - Q3PtrListIterator liter(RelsToCheck); // the key is __ QMap arrows; char s[128]; - for (;;) { - ArrowCanvas * r = liter.current(); - - if (r == 0) - break; - + foreach (ArrowCanvas *r, RelsToCheck) { if (r->visible()) { sprintf(s, "%lx_%lx_%lx", (long) r->get_start(), @@ -2241,10 +2228,7 @@ void ArrowCanvas::remove_redondant_rels() else arrows.insert(s, r); } - - ++liter; } - RelsToCheck.clear(); } diff --git a/src/diagram/ArrowCanvas.h b/src/diagram/ArrowCanvas.h index de015c35d..874db0358 100644 --- a/src/diagram/ArrowCanvas.h +++ b/src/diagram/ArrowCanvas.h @@ -84,10 +84,10 @@ class ArrowCanvas : public QObject, public Q3CanvasPolygon, public DiagramItem float decenter_end; // fixed geometry. < 0 means don't care // to remove temporary arrows - static Q3PtrList RelsToDel; + static QList RelsToDel; // to remove redondant relation made by release 2.22 - static Q3PtrList RelsToCheck; + static QList RelsToCheck; public: ArrowCanvas(UmlCanvas * canvas, DiagramItem * b, DiagramItem * e, diff --git a/src/diagram/ArrowJunctionCanvas.cpp b/src/diagram/ArrowJunctionCanvas.cpp index 9e124e22b..2beb43e35 100644 --- a/src/diagram/ArrowJunctionCanvas.cpp +++ b/src/diagram/ArrowJunctionCanvas.cpp @@ -109,10 +109,9 @@ void ArrowJunctionCanvas::draw(QPainter & p) if (!visible()) return; - ArrowCanvas * a; FILE * fp = svg(); - for (a = lines.first(); a != 0; a = lines.next()) { + foreach (ArrowCanvas *a, lines) { switch (a->type()) { case UmlRequired: { QRect r = rect(); diff --git a/src/diagram/ArrowPointCanvas.cpp b/src/diagram/ArrowPointCanvas.cpp index ab87ac66e..19e788d9c 100644 --- a/src/diagram/ArrowPointCanvas.cpp +++ b/src/diagram/ArrowPointCanvas.cpp @@ -72,7 +72,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 @@ -241,7 +241,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 diff --git a/src/diagram/ArtifactCanvas.cpp b/src/diagram/ArtifactCanvas.cpp index 5a0cc4260..569ed5833 100644 --- a/src/diagram/ArtifactCanvas.cpp +++ b/src/diagram/ArtifactCanvas.cpp @@ -252,14 +252,10 @@ void ArtifactCanvas::draw_all_relations() else if (!DrawingSettings::just_modified() && !on_load_diagram()) { // remove all association starting from 'this' - Q3PtrListIterator 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->type() == UmlContain) && + (((AssocContainCanvas *) canvas)->get_start() == this)) + canvas->delete_it(); } // update non source artifact vis a vis 'this' @@ -287,18 +283,15 @@ void ArtifactCanvas::update_relations(ArtifactCanvas * other) bool association_must_exist = ((associated != 0) && (associated->find((BrowserArtifact *) other->browser_node) != 0)); - Q3PtrListIterator it(lines); - while (it.current()) { - if ((it.current()->type() == UmlContain) && - (((AssocContainCanvas *) it.current())->get_end() == other)) { + foreach (ArrowCanvas *canvas, lines) { + if ((canvas->type() == UmlContain) && + (((AssocContainCanvas *) canvas)->get_end() == other)) { if (! association_must_exist) - it.current()->delete_it(); + canvas->delete_it(); return; } - - ++it; } // association not yet exist @@ -314,12 +307,10 @@ void ArtifactCanvas::update_relations() const Q3PtrDict * associated = ((ArtifactData *) browser_node->get_data())->get_associated(); Q3PtrDict associations; - Q3PtrListIterator it(lines); - - while (it.current()) { - if ((it.current()->type() == UmlContain) && - (((AssocContainCanvas *) it.current())->get_start() == this)) { - DiagramItem * adi = ((AssocContainCanvas *) it.current())->get_end(); + foreach (ArrowCanvas *canvas, lines) { + if ((canvas->type() == UmlContain) && + (((AssocContainCanvas *)canvas)->get_start() == this)) { + DiagramItem * adi = ((AssocContainCanvas *) canvas)->get_end(); if ((adi->type() == UmlArtifact) && (associated != 0) && @@ -330,14 +321,11 @@ void ArtifactCanvas::update_relations() ((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) { @@ -787,7 +775,7 @@ bool ArtifactCanvas::has_drawing_settings() const return TRUE; } -void ArtifactCanvas::edit_drawing_settings(Q3PtrList & l) +void ArtifactCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -800,11 +788,10 @@ void ArtifactCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/ArtifactCanvas.h b/src/diagram/ArtifactCanvas.h index 53f8fb27e..b02e61ee9 100644 --- a/src/diagram/ArtifactCanvas.h +++ b/src/diagram/ArtifactCanvas.h @@ -85,7 +85,7 @@ class ArtifactCanvas : public QObject, public DiagramCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); diff --git a/src/diagram/BrowserView.cpp b/src/diagram/BrowserView.cpp index 3bcc87900..9164b1817 100644 --- a/src/diagram/BrowserView.cpp +++ b/src/diagram/BrowserView.cpp @@ -399,14 +399,9 @@ void BrowserView::OnGenerateIdl() void BrowserView::OnUnmarkItem(QString name, int type) { - Q3PtrListIterator it( BrowserNode::marked_list ); - BrowserNode *node; - while ( (node = it.current()) != 0 ) - { - ++it; + foreach (BrowserNode *node, BrowserNode::marked_list) if(node->get_name() == name && node->get_type() == type) node->toggle_mark(); - } } void BrowserView::OnUnmarkAll() diff --git a/src/diagram/CdClassCanvas.cpp b/src/diagram/CdClassCanvas.cpp index 46cc43bcb..cc8ce1b11 100644 --- a/src/diagram/CdClassCanvas.cpp +++ b/src/diagram/CdClassCanvas.cpp @@ -526,32 +526,22 @@ void CdClassCanvas::post_loaded() void CdClassCanvas::check_inner() { - Q3PtrListIterator 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->type() == 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 it(lines); - - while (it.current()) { - if (IsaRelation(it.current()->type()) && - (((RelationCanvas *) it.current())->get_data() == def)) + foreach (ArrowCanvas *canvas, lines) { + if (IsaRelation(canvas->type()) && + (((RelationCanvas *) canvas)->get_data() == def)) return TRUE; - - ++it; } return FALSE; @@ -559,14 +549,10 @@ bool CdClassCanvas::has_relation(BasicData * def) const bool CdClassCanvas::has_inner(DiagramItem * end) const { - Q3PtrListIterator it(lines); - - while (it.current()) { - if ((it.current()->type() == UmlInner) && - (((ArrowCanvas *) it.current())->get_end() == end)) + foreach (ArrowCanvas *canvas, lines) { + if ((canvas->type() == UmlInner) && + (canvas->get_end() == end)) return TRUE; - - ++it; } return FALSE; @@ -1265,7 +1251,7 @@ static CdClassCanvas * container_class_without_inner(CdClassCanvas * cln) void CdClassCanvas::menu(const QPoint &) { - Q3PtrList l = + QList l = ((BrowserClass *) browser_node)->inherited_operations(21); Q3PopupMenu m(0); Q3PopupMenu gensubm(0); @@ -1344,14 +1330,11 @@ void CdClassCanvas::menu(const QPoint &) if (l.count() > 20) m.insertItem(TR("Add inherited operation"), 2999); else { - BrowserOperation * oper; - MenuFactory::createTitle(inhopersubm, TR("Choose operation")); inhopersubm.insertSeparator(); - 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()) @@ -1364,6 +1347,7 @@ void CdClassCanvas::menu(const QPoint &) } else inhopersubm.insertItem(menuItemText,index); + ++index; } m.insertItem(TR("Add inherited operation"), &inhopersubm); @@ -1571,7 +1555,7 @@ void CdClassCanvas::menu(const QPoint &) case 1999: { OperationListDialog dialog(TR("Choose operation to edit"), - (Q3PtrList &) operations); + (QList &) operations); dialog.raise(); @@ -1675,7 +1659,7 @@ bool CdClassCanvas::has_drawing_settings() const return TRUE; } -void CdClassCanvas::edit_drawing_settings(Q3PtrList & l) +void CdClassCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st; @@ -1692,15 +1676,14 @@ void CdClassCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } @@ -1836,12 +1819,10 @@ static void save_hidden_list(BrowserNode * bn, UmlCode c, QTextStream & st, bn->children(l, c); - Q3PtrListIterator it(l); - - while (it.current() != 0) { + foreach (BrowserNode *node, l) { QString dummy; - if (hidden_visible.findIndex(it.current()) != -1) { + if (hidden_visible.findIndex(node) != -1) { if (s != 0) { nl_indent(st); st << s; @@ -1850,10 +1831,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')) { @@ -1946,7 +1925,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); } } @@ -1961,7 +1940,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); } } diff --git a/src/diagram/CdClassCanvas.h b/src/diagram/CdClassCanvas.h index 8d4f7b3d7..a701c3e32 100644 --- a/src/diagram/CdClassCanvas.h +++ b/src/diagram/CdClassCanvas.h @@ -112,7 +112,7 @@ class CdClassCanvas : public QObject, public DiagramCanvas, virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/ClassDiagramView.cpp b/src/diagram/ClassDiagramView.cpp index e7fb2810c..0633ad863 100644 --- a/src/diagram/ClassDiagramView.cpp +++ b/src/diagram/ClassDiagramView.cpp @@ -87,11 +87,7 @@ static bool not_yet_drawn(BrowserNode * container, // have marked elements not yet drawn ? static bool marked_not_yet_drawn(Q3PtrDict & drawn) { - const Q3PtrList & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; - - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode * bn, BrowserNode::marked_nodes()) { UmlCode k = bn->get_type(); switch (k) { @@ -113,9 +109,7 @@ static bool marked_not_yet_drawn(Q3PtrDict & drawn) static void get_drawn(DiagramItemList & items, Q3PtrDict & drawn) { - DiagramItem * di; - - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem * di, items) { UmlCode k = di->type(); switch (k) { @@ -261,11 +255,8 @@ void ClassDiagramView::add_marked_elements(const QPoint & p, int x = p.x(); int y = p.y(); int future_y = y; - const Q3PtrList & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode * bn, BrowserNode::marked_nodes()) { if (drawn[bn->get_data()] == 0) { DiagramCanvas * dc; @@ -308,7 +299,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(); @@ -352,20 +343,18 @@ void ClassDiagramView::add_related_elements(DiagramItem * di, QString what, int x = re.x(); int y = re.bottom() + Diagram_Margin; int future_y = y; - Q3PtrListIterator 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: @@ -534,7 +523,6 @@ void ClassDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -544,7 +532,7 @@ 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()) { + foreach (DiagramItem * di, items) { switch (di->type()) { case UmlClass: case UmlNote: @@ -564,7 +552,7 @@ 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(); @@ -575,7 +563,7 @@ void ClassDiagramView::save(QTextStream & st, QString & warning, // then saves anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem * di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); diff --git a/src/diagram/CodClassInstCanvas.cpp b/src/diagram/CodClassInstCanvas.cpp index 5751a23ad..a0fa1ed65 100644 --- a/src/diagram/CodClassInstCanvas.cpp +++ b/src/diagram/CodClassInstCanvas.cpp @@ -441,7 +441,7 @@ bool CodClassInstCanvas::has_drawing_settings() const return TRUE; } -void CodClassInstCanvas::edit_drawing_settings(Q3PtrList & l) +void CodClassInstCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(2); @@ -459,21 +459,20 @@ void CodClassInstCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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() } } @@ -630,7 +629,7 @@ void CodClassInstCanvas::history_load(QBuffer & b) void CodClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all) { - Q3PtrList l; + QList l; Q3CanvasItemList::Iterator cit; for (cit = all.begin(); cit != all.end(); ++cit) { @@ -651,11 +650,7 @@ void CodClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all) com->write_unsigned(l.count()); - Q3PtrListIterator 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 3e074f05a..39fec9f39 100644 --- a/src/diagram/CodClassInstCanvas.h +++ b/src/diagram/CodClassInstCanvas.h @@ -79,7 +79,7 @@ class CodClassInstCanvas : public QObject, public CodObjCanvas, public ClassInst virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/CodDirsCanvas.cpp b/src/diagram/CodDirsCanvas.cpp index c49f2b1b4..1df1193fc 100644 --- a/src/diagram/CodDirsCanvas.cpp +++ b/src/diagram/CodDirsCanvas.cpp @@ -77,7 +77,7 @@ void CodDirsCanvas::remove_it(ColMsg * msg) if (unsubscribe(oper_data)) disconnect(oper_data, 0, this, 0); - msgs.removeRef(msg); + msgs.remove(msg); } @@ -140,19 +140,17 @@ void CodDirsCanvas::update_msgs() // cannot be modified in this case msgs.sort(); - Q3PtrListIterator 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)) { @@ -486,10 +484,7 @@ void CodDirsCanvas::history_load(QBuffer & b) ::load(angle, b); connect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified())); - Q3PtrListIterator 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)) { @@ -504,10 +499,7 @@ void CodDirsCanvas::history_hide() Q3CanvasItem::setVisible(FALSE); disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified())); - Q3PtrListIterator 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)) { 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/CodObjCanvas.cpp b/src/diagram/CodObjCanvas.cpp index 73303e127..04f2ea8f9 100644 --- a/src/diagram/CodObjCanvas.cpp +++ b/src/diagram/CodObjCanvas.cpp @@ -144,17 +144,15 @@ void CodObjCanvas::get_all_in_all_out(ColMsgList & all_in, ColMsgList & all_out) all_out = all_in; } - Q3PtrListIterator 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->type() == 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/CodSelfLinkCanvas.cpp b/src/diagram/CodSelfLinkCanvas.cpp index 7ed03e63f..318e1cdc0 100644 --- a/src/diagram/CodSelfLinkCanvas.cpp +++ b/src/diagram/CodSelfLinkCanvas.cpp @@ -85,7 +85,7 @@ void CodSelfLinkCanvas::remove_it(ColMsg * msg) if (unsubscribe(oper_data)) disconnect(oper_data, 0, this, 0); - msgs.removeRef(msg); + msgs.remove(msg); } void CodSelfLinkCanvas::delete_available(BooL &, BooL & out_model) const @@ -166,23 +166,22 @@ void CodSelfLinkCanvas::update_msgs() the_canvas()->browser_diagram()->get_collaborationdiagramsettings(dflt); - Q3PtrListIterator 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; @@ -449,10 +448,8 @@ void CodSelfLinkCanvas::history_load(QBuffer & b) ::load(delta_y, b); ::load(angle, b); - Q3PtrListIterator 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 +463,10 @@ void CodSelfLinkCanvas::history_hide() DiagramCanvas::setVisible(FALSE); disconnect(DrawingSettings::instance(), SIGNAL(changed()), this, SLOT(modified())); - Q3PtrListIterator 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/ColDiagramView.cpp b/src/diagram/ColDiagramView.cpp index 7cf3e059e..214332779 100644 --- a/src/diagram/ColDiagramView.cpp +++ b/src/diagram/ColDiagramView.cpp @@ -321,7 +321,6 @@ void ColDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -331,7 +330,7 @@ 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()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlPackage: case UmlFragment: @@ -352,7 +351,7 @@ void ColDiagramView::save(QTextStream & st, QString & warning, // then save links selflink and dirs (without messages) - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlLink: // saves associated dirs case UmlSelfLink: @@ -370,7 +369,7 @@ void ColDiagramView::save(QTextStream & st, QString & warning, // then save anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); diff --git a/src/diagram/ColMsg.cpp b/src/diagram/ColMsg.cpp index 7d7fc21e0..dacc2adfe 100644 --- a/src/diagram/ColMsg.cpp +++ b/src/diagram/ColMsg.cpp @@ -46,17 +46,22 @@ #include #include -int ColMsgList::compareItems(Q3PtrCollection::Item item1, - Q3PtrCollection::Item item2) +void ColMsgList::sort() { - unsigned r1 = ((ColMsg *) item1)->get_rank(); - unsigned r2 = ((ColMsg *) item2)->get_rank(); + qSort(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 +82,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 +95,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 +110,16 @@ void ColMsg::delete_it_internal() bool ColMsg::extract_it(ColMsgList & top) { - Q3PtrListIterator 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; @@ -160,11 +164,11 @@ QString ColMsg::next_hierarchical_rank() const void ColMsg::update_ranks(ColMsgList & msgs) { unsigned rank = 0; - unsigned hi_rank; - Q3PtrListIterator 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 +178,19 @@ void ColMsg::update_ranks(unsigned & r, QString hr) hr += '.'; - unsigned hi_rank; - Q3PtrListIterator 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 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 +205,15 @@ ColMsg * ColMsg::new_one(const OperationData * d, const QString & e, bool f, void ColMsg::place_in_its_support() { - unsigned index; - Q3PtrListIterator 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)) { + unsigned index = 0; + foreach (ColMsg *msg, in->get_msgs()) { + if (!gt(hr, msg->hierarchical_rank)) { 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 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 it(*pl); - ColMsg * m; + QListIterator it(*pl); + ColMsg * m = 0; unsigned index = pl->count(); - for (it.toLast(), index = pl->count(); (m = it.current()) != 0; --it, index -= 1) + it.toBack(); + while (it.hasPrevious()) { + m = it.previous(); if (gt(hierarchical_rank, m->hierarchical_rank)) 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 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 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, nestedMsg->hierarchical_rank)) break; + ++index; + } - l.insert(index, it.current()); + l.insert(index, msg); } } ColMsg * ColMsg::find(const QString & hi, ColMsgList & l) { - Q3PtrListIterator 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 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 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 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); diff --git a/src/diagram/ColMsg.h b/src/diagram/ColMsg.h index 66f1b0703..7c22eec8b 100644 --- a/src/diagram/ColMsg.h +++ b/src/diagram/ColMsg.h @@ -48,10 +48,12 @@ class ColMsg; //[lgfreitas] q3ptrlist needed #include -class ColMsgList : public Q3PtrList +class ColMsgList : public QList { +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 748c3bd43..de13e654e 100644 --- a/src/diagram/ComponentCanvas.cpp +++ b/src/diagram/ComponentCanvas.cpp @@ -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(); @@ -1023,7 +1015,7 @@ bool ComponentCanvas::has_drawing_settings() const return TRUE; } -void ComponentCanvas::edit_drawing_settings(Q3PtrList & l) +void ComponentCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(4); @@ -1043,25 +1035,25 @@ void ComponentCanvas::edit_drawing_settings(Q3PtrList & l) SettingsDialog dialog(&st, &co, FALSE, TRUE); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/ComponentCanvas.h b/src/diagram/ComponentCanvas.h index 9f00b7f7a..b3fd34788 100644 --- a/src/diagram/ComponentCanvas.h +++ b/src/diagram/ComponentCanvas.h @@ -100,7 +100,7 @@ class ComponentCanvas : public QObject, public DiagramCanvas, virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/ComponentDiagramView.cpp b/src/diagram/ComponentDiagramView.cpp index e09390134..e4e4205b1 100644 --- a/src/diagram/ComponentDiagramView.cpp +++ b/src/diagram/ComponentDiagramView.cpp @@ -68,11 +68,7 @@ ComponentDiagramView::ComponentDiagramView(QWidget * parent, UmlCanvas * canvas, // have marked elements not yet drawn ? static bool marked_not_yet_drawn(Q3PtrDict & drawn) { - const Q3PtrList & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; - - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, BrowserNode::marked_nodes()) { UmlCode k = bn->get_type(); switch (k) { @@ -94,9 +90,7 @@ static bool marked_not_yet_drawn(Q3PtrDict & drawn) static void get_drawn(DiagramItemList & items, Q3PtrDict & drawn) { - DiagramItem * di; - - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { UmlCode k = di->type(); switch (k) { @@ -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 & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, BrowserNode::marked_nodes()) { if (drawn[bn->get_data()] == 0) { DiagramCanvas * dc; @@ -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); @@ -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 it(l); - BrowserNode * bn; - - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, l) { if (drawn[bn->get_data()] == 0) { DiagramCanvas * dc; @@ -422,7 +410,6 @@ void ComponentDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -432,7 +419,7 @@ 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()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlComponent: case UmlNote: @@ -453,7 +440,7 @@ void ComponentDiagramView::save(QTextStream & st, QString & warning, // then saves relations - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlInherit: case UmlDependency: @@ -470,7 +457,7 @@ void ComponentDiagramView::save(QTextStream & st, QString & warning, // then saves anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); diff --git a/src/diagram/ConstraintCanvas.cpp b/src/diagram/ConstraintCanvas.cpp index f43553072..30863dd12 100644 --- a/src/diagram/ConstraintCanvas.cpp +++ b/src/diagram/ConstraintCanvas.cpp @@ -245,7 +245,7 @@ bool ConstraintCanvas::has_drawing_settings() const return TRUE; } -void ConstraintCanvas::edit_drawing_settings(Q3PtrList & l) +void ConstraintCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -258,11 +258,10 @@ void ConstraintCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } @@ -292,11 +291,10 @@ ConstraintCanvas::compute(UmlCanvas * canvas, 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()); @@ -310,7 +308,7 @@ ConstraintCanvas::compute(UmlCanvas * canvas, else if (current->indicate_visible) { Q3ValueList & visible = current->hidden_visible; - for (bn = elts.first(); bn != 0; bn = elts.next()) { + foreach (BrowserNode *bn, elts) { if (visible.findIndex(bn) != -1) { if (bn->get_type() == UmlClass) // change on class's members modify class => memorize classes only @@ -326,7 +324,7 @@ ConstraintCanvas::compute(UmlCanvas * canvas, else { Q3ValueList & hidden = current->hidden_visible; - for (bn = elts.first(); bn != 0; bn = elts.next()) { + foreach (BrowserNode *bn, elts) { if (hidden.findIndex(bn) == -1) { if (bn->get_type() == UmlClass) // change on class's members modify class => memorize classes only diff --git a/src/diagram/ConstraintCanvas.h b/src/diagram/ConstraintCanvas.h index 453542ed1..c56bfe1bd 100644 --- a/src/diagram/ConstraintCanvas.h +++ b/src/diagram/ConstraintCanvas.h @@ -67,7 +67,7 @@ class ConstraintCanvas : public NoteCanvas virtual void apply_shortcut(QString s); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void save(QTextStream & st, bool ref, QString & warning) const; diff --git a/src/diagram/DeploymentDiagramView.cpp b/src/diagram/DeploymentDiagramView.cpp index 940affd75..c56aec118 100644 --- a/src/diagram/DeploymentDiagramView.cpp +++ b/src/diagram/DeploymentDiagramView.cpp @@ -73,11 +73,7 @@ DeploymentDiagramView::DeploymentDiagramView(QWidget * parent, UmlCanvas * canva // have marked elements not yet drawn ? static bool marked_not_yet_drawn(Q3PtrDict & drawn) { - const Q3PtrList & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; - - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, BrowserNode::marked_nodes()) { UmlCode k = bn->get_type(); switch (k) { @@ -101,9 +97,7 @@ static bool marked_not_yet_drawn(Q3PtrDict & drawn) static void get_drawn(DiagramItemList & items, Q3PtrDict & drawn) { - DiagramItem * di; - - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { UmlCode k = di->type(); switch (k) { @@ -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 & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, BrowserNode::marked_nodes()) { if (drawn[bn->get_data()] == 0) { DiagramCanvas * dc; @@ -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); @@ -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 it(l); - BrowserNode * bn; - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, l) { if (drawn[bn->get_data()] == 0) { DiagramCanvas * dc; @@ -535,7 +524,6 @@ void DeploymentDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -545,7 +533,7 @@ 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()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlDeploymentNode: case UmlArtifact: @@ -568,7 +556,7 @@ void DeploymentDiagramView::save(QTextStream & st, QString & warning, // then saves relations - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlInherit: case UmlDependency: @@ -585,7 +573,7 @@ void DeploymentDiagramView::save(QTextStream & st, QString & warning, // then saves anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); diff --git a/src/diagram/DeploymentNodeCanvas.cpp b/src/diagram/DeploymentNodeCanvas.cpp index a070eabdc..46754b177 100644 --- a/src/diagram/DeploymentNodeCanvas.cpp +++ b/src/diagram/DeploymentNodeCanvas.cpp @@ -619,7 +619,7 @@ bool DeploymentNodeCanvas::has_drawing_settings() const return TRUE; } -void DeploymentNodeCanvas::edit_drawing_settings(Q3PtrList & l) +void DeploymentNodeCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(2); @@ -637,21 +637,20 @@ void DeploymentNodeCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { + foreach (DiagramItem *item, l) { + DeploymentNodeCanvas *canvas = (DeploymentNodeCanvas *)item; if (!st[0].name.isEmpty()) - ((DeploymentNodeCanvas *) it.current())->write_horizontally = + canvas->write_horizontally = write_horizontally; if (!st[1].name.isEmpty()) - ((DeploymentNodeCanvas *) it.current())->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(); } } diff --git a/src/diagram/DeploymentNodeCanvas.h b/src/diagram/DeploymentNodeCanvas.h index 42e50264c..d3ac70e0d 100644 --- a/src/diagram/DeploymentNodeCanvas.h +++ b/src/diagram/DeploymentNodeCanvas.h @@ -95,7 +95,7 @@ class DeploymentNodeCanvas virtual void set_type(BrowserNode * t); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/DiagramCanvas.cpp b/src/diagram/DiagramCanvas.cpp index a5494a510..fdb38ce4d 100644 --- a/src/diagram/DiagramCanvas.cpp +++ b/src/diagram/DiagramCanvas.cpp @@ -195,15 +195,10 @@ void DiagramCanvas::moveBy(double dx, double dy) void DiagramCanvas::moveSelfRelsBy(double dx, double dy) { - Q3PtrListIterator 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) @@ -426,14 +421,10 @@ void DiagramCanvas::prepare_for_move(bool on_resize) { if (! on_resize) { // select self relations - Q3PtrListIterator 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,7 +443,6 @@ bool DiagramCanvas::move_with(UmlCode k) const void DiagramCanvas::force_self_rel_visible() { - Q3PtrListIterator it(lines); QRect r = rect(); // add a marging @@ -461,12 +451,10 @@ void DiagramCanvas::force_self_rel_visible() 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); } } @@ -490,11 +478,8 @@ void DiagramCanvas::upper() nz += 1; - Q3PtrListIterator it(lines); - - while (it.current()) { - it.current()->go_up(nz); - ++it; + foreach (ArrowCanvas *canvas, lines) { + canvas->go_up(nz); } } } @@ -564,12 +549,8 @@ void DiagramCanvas::z_up() set_z(next_z); - Q3PtrListIterator it(lines); - - while (it.current()) { - it.current()->go_up(next_z); - ++it; - } + foreach (ArrowCanvas *canvas, lines) + canvas->go_up(next_z); } } @@ -836,14 +817,10 @@ double DiagramCanvas::compute_angle(double delta_x, double delta_y) bool DiagramCanvas::has_simple_relation(BasicData * def) const { - Q3PtrListIterator it(lines); - - while (it.current()) { - if (IsaSimpleRelation(it.current()->type()) && - (((SimpleRelationCanvas *) it.current())->get_data() == def)) + foreach (ArrowCanvas *canvas, lines) { + if (IsaSimpleRelation(canvas->type()) && + (((SimpleRelationCanvas *) canvas)->get_data() == def)) return TRUE; - - ++it; } return FALSE; @@ -913,14 +890,10 @@ void DiagramCanvas::draw_all_simple_relations(DiagramCanvas * end) bool DiagramCanvas::has_flow(BasicData * def) const { - Q3PtrListIterator it(lines); - - while (it.current()) { - if ((it.current()->type() == UmlFlow) && - (((FlowCanvas *) it.current())->get_data() == def)) + foreach (ArrowCanvas *canvas, lines) { + if ((canvas->type() == UmlFlow) && + (((FlowCanvas *) canvas)->get_data() == def)) return TRUE; - - ++it; } return FALSE; @@ -989,14 +962,10 @@ void DiagramCanvas::draw_all_flows(DiagramCanvas * end) bool DiagramCanvas::has_transition(BasicData * def) const { - Q3PtrListIterator it(lines); - - while (it.current()) { - if ((it.current()->type() == UmlTransition) && - (((TransitionCanvas *) it.current())->get_data() == def)) + foreach (ArrowCanvas *canvas, lines) { + if ((canvas->type() == UmlTransition) && + (((TransitionCanvas *) canvas)->get_data() == def)) return TRUE; - - ++it; } return FALSE; diff --git a/src/diagram/DiagramItem.cpp b/src/diagram/DiagramItem.cpp index 123deb389..4653fef63 100644 --- a/src/diagram/DiagramItem.cpp +++ b/src/diagram/DiagramItem.cpp @@ -43,7 +43,7 @@ #include "myio.h" #include "translate.h" -Q3PtrList DiagramItem::Undefined; +QList DiagramItem::Undefined; DiagramItem::DiagramItem(int id, UmlCanvas * canvas) : Labeled(canvas->get_all_items(), id) @@ -70,20 +70,16 @@ void DiagramItem::remove(bool) void DiagramItem::hide_lines() { - Q3PtrListIterator it(lines); - - for (; it.current(); ++it) - it.current()->hide(); + foreach (ArrowCanvas *canvas, lines) + canvas->hide(); } void DiagramItem::update_show_lines() { - Q3PtrListIterator 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(); } } @@ -99,10 +95,8 @@ void DiagramItem::check_line(ArrowCanvas *) bool DiagramItem::attached_to(const ArrowCanvas * l) const { - Q3PtrListIterator it(lines); - - for (; it.current(); ++it) - if (it.current() == l) + foreach (ArrowCanvas *canvas, lines) + if (canvas == l) return TRUE; return FALSE; @@ -188,8 +182,9 @@ void DiagramItem::remove_if_already_present() 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,29 +203,18 @@ BasicData * DiagramItem::add_relation(UmlCode t, DiagramItem * end) bool DiagramItem::has_relation(BasicData * def) const { // manage only SimpleRelations - Q3PtrListIterator it(lines); - - while (it.current()) { - if (IsaSimpleRelation(it.current()->type()) && - (it.current()->get_data() == def)) + foreach (ArrowCanvas *canvas, lines) + if (IsaSimpleRelation(canvas->type()) && (canvas->get_data() == def)) return TRUE; - ++it; - } - return FALSE; } bool DiagramItem::has_relation(UmlCode t, BasicData * def) const { - Q3PtrListIterator it(lines); - - while (it.current()) { - if ((it.current()->type() == t) && - (it.current()->get_data() == def)) + foreach (ArrowCanvas *canvas, lines) { + if ((canvas->type() == t) && (canvas->get_data() == def)) return TRUE; - - ++it; } return FALSE; @@ -253,10 +237,8 @@ bool DiagramItem::move_with(UmlCode) const void DiagramItem::select_associated() { - Q3PtrListIterator it(lines); - - for (; it.current(); ++it) - it.current()->select_associated(); + foreach (ArrowCanvas *canvas, lines) + canvas->select_associated(); } void DiagramItem::unassociate(DiagramItem *) @@ -400,13 +382,14 @@ bool DiagramItem::has_drawing_settings() const return FALSE; } -void DiagramItem::edit_drawing_settings(Q3PtrList &) +void DiagramItem::edit_drawing_settings(QList &) { // never called } void DiagramItem::clone_drawing_settings(const DiagramItem *src) { + Q_UNUSED(src); // never called } @@ -437,11 +420,13 @@ DiagramItemList::~DiagramItemList() { } -int DiagramItemList::compareItems(Q3PtrCollection::Item i1, - Q3PtrCollection::Item i2) +void DiagramItemList::sort() +{ + qSort(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 304ec1755..f3c391108 100644 --- a/src/diagram/DiagramItem.h +++ b/src/diagram/DiagramItem.h @@ -58,9 +58,9 @@ class UmlCanvas; class DiagramItem : public Labeled { protected: - Q3PtrList lines; + QList lines; - static Q3PtrList Undefined; + static QList Undefined; public: DiagramItem(int id, UmlCanvas * canvas); @@ -133,7 +133,7 @@ class DiagramItem : public Labeled } virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString); @@ -146,12 +146,14 @@ class DiagramItem : public Labeled virtual bool represents(BrowserNode *); }; -class DiagramItemList : public Q3PtrList +class DiagramItemList : public QList { public: DiagramItemList(Q3CanvasItemList); virtual ~DiagramItemList(); - virtual int compareItems(Q3PtrCollection::Item, Q3PtrCollection::Item); + + void sort(); + static bool lessThan(DiagramItem *a, DiagramItem *b); }; diff --git a/src/diagram/DiagramView.cpp b/src/diagram/DiagramView.cpp index ac622a2d3..61312de0c 100644 --- a/src/diagram/DiagramView.cpp +++ b/src/diagram/DiagramView.cpp @@ -113,8 +113,6 @@ DiagramView::DiagramView(QWidget * parent, UmlCanvas * canvas, int i) canvas->setDoubleBuffering(TRUE); canvas->set_view(this); - - history.setAutoDelete(TRUE); } void DiagramView::init() @@ -148,7 +146,7 @@ void DiagramView::contentsMouseDoubleClickEvent(QMouseEvent * e) bool DiagramView::multiple_selection_for_menu(BooL & in_model, BooL & out_model, BooL & alignable, int & n_resize, - Q3PtrList & l_drawing_settings, + QList & l_drawing_settings, const Q3CanvasItemList & selected) { Q3CanvasItemList::ConstIterator it; @@ -223,7 +221,7 @@ void DiagramView::contentsMousePressEvent(QMouseEvent * e) BooL in_model; BooL out_model; BooL alignable; - Q3PtrList l_drawing_settings; + QList l_drawing_settings; int n_resize; if (multiple_selection_for_menu(in_model, out_model, alignable, @@ -1007,7 +1005,7 @@ 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 & l_drawing_settings) + QList & l_drawing_settings) { const Q3CanvasItemList selected = selection(); Q3CanvasItemList::ConstIterator it; @@ -1158,12 +1156,12 @@ void DiagramView::multiple_selection_menu(bool in_model, bool out_model, same_size(TRUE, TRUE); break; - case 17: { + case 17: history_protected = FALSE; - Q3PtrListIterator it(l_drawing_settings); - const DiagramItem *source = it.current(); - while (++it, it.current() != 0) - it.current()->clone_drawing_settings(source); + 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: @@ -1433,7 +1431,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e) (s == "Same drawing settings")) { Q3CanvasItemList::ConstIterator it; UmlCode k = UmlCodeSup; - Q3PtrList l; + QList l; for (it = selected.begin(); it != selected.end(); ++it) { if (! isa_label(*it)) { @@ -1481,10 +1479,11 @@ void DiagramView::keyPressEvent(QKeyEvent * e) l.first()->edit_drawing_settings(l); else { history_protected = FALSE; - Q3PtrListIterator it(l); - const DiagramItem *source = it.current(); - while (++it, it.current() != 0) - it.current()->clone_drawing_settings(source); + if (!l.isEmpty()) { + const DiagramItem *source = l[0]; + for (int i = 1, n = l.size(); i < n; ++i) + l[i]->clone_drawing_settings(source); + } } } } @@ -1542,7 +1541,7 @@ void DiagramView::keyPressEvent(QKeyEvent * e) BooL in_model; BooL out_model; BooL alignable; - Q3PtrList l_drawing_settings; + QList l_drawing_settings; int n_resize; if (multiple_selection_for_menu(in_model, out_model, alignable, @@ -2659,8 +2658,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); @@ -2671,10 +2670,10 @@ void DiagramView::history_save(bool on_undo) */ 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(); @@ -2684,19 +2683,15 @@ void DiagramView::history_save(bool on_undo) history_index = 0; } else { - QByteArray * current = history.at(history_index); + const QByteArray ¤t = 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 @@ -2717,15 +2712,14 @@ void DiagramView::history_load() unselect_all(); DiagramItemList items(canvas()->allItems()); - DiagramItem * di; - - for (di = items.first(); di != 0; di = items.next()) { + 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); diff --git a/src/diagram/DiagramView.h b/src/diagram/DiagramView.h index 6c6f186bf..7ab2e451a 100644 --- a/src/diagram/DiagramView.h +++ b/src/diagram/DiagramView.h @@ -78,7 +78,7 @@ class DiagramView : public Q3CanvasView BooL decenter_start; BooL decenter_horiz; Q3ValueList previousResizeCorrection; - Q3PtrList history; + QList history; unsigned history_index; @@ -112,7 +112,7 @@ class DiagramView : public Q3CanvasView return preferred_zoom != 0; } void multiple_selection_menu(bool in_model, bool out_model, bool alignable, - int n_resize, Q3PtrList & l_drawing_settings); + int n_resize, QList & l_drawing_settings); bool is_present(BrowserNode * bn); virtual void add_related_elements(DiagramItem *, QString what, bool inh, bool assoc); @@ -175,7 +175,7 @@ class DiagramView : public Q3CanvasView void add_point(QMouseEvent * e); bool multiple_selection_for_menu(BooL & in_model, BooL & out_model, BooL & alignable, int & n_resize, - Q3PtrList & l_drawing_settings, + QList & l_drawing_settings, const Q3CanvasItemList & selected); void set_format(int); diff --git a/src/diagram/ExpansionNodeCanvas.cpp b/src/diagram/ExpansionNodeCanvas.cpp index a06d01262..f78db21a3 100644 --- a/src/diagram/ExpansionNodeCanvas.cpp +++ b/src/diagram/ExpansionNodeCanvas.cpp @@ -443,7 +443,7 @@ bool ExpansionNodeCanvas::has_drawing_settings() const return TRUE; } -void ExpansionNodeCanvas::edit_drawing_settings(Q3PtrList & l) +void ExpansionNodeCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -456,11 +456,10 @@ void ExpansionNodeCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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() } } diff --git a/src/diagram/ExpansionNodeCanvas.h b/src/diagram/ExpansionNodeCanvas.h index ece268512..32380102c 100644 --- a/src/diagram/ExpansionNodeCanvas.h +++ b/src/diagram/ExpansionNodeCanvas.h @@ -82,7 +82,7 @@ class ExpansionNodeCanvas : public QObject, public DiagramCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/ExpansionRegionCanvas.cpp b/src/diagram/ExpansionRegionCanvas.cpp index 486103b27..22e3b3840 100644 --- a/src/diagram/ExpansionRegionCanvas.cpp +++ b/src/diagram/ExpansionRegionCanvas.cpp @@ -612,7 +612,7 @@ bool ExpansionRegionCanvas::has_drawing_settings() const return TRUE; } -void ExpansionRegionCanvas::edit_drawing_settings(Q3PtrList & l) +void ExpansionRegionCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -625,11 +625,10 @@ void ExpansionRegionCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/ExpansionRegionCanvas.h b/src/diagram/ExpansionRegionCanvas.h index a87f74174..d87dd2307 100644 --- a/src/diagram/ExpansionRegionCanvas.h +++ b/src/diagram/ExpansionRegionCanvas.h @@ -106,7 +106,7 @@ class ExpansionRegionCanvas : public QObject, public ActivityContainerCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/FlowCanvas.cpp b/src/diagram/FlowCanvas.cpp index 5f03dab21..9f4c47558 100644 --- a/src/diagram/FlowCanvas.cpp +++ b/src/diagram/FlowCanvas.cpp @@ -420,7 +420,7 @@ bool FlowCanvas::has_drawing_settings() const return ((aplabel != 0) || (apstereotype != 0)); } -void FlowCanvas::edit_drawing_settings(Q3PtrList & l) +void FlowCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(1); @@ -436,16 +436,15 @@ void FlowCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/FlowCanvas.h b/src/diagram/FlowCanvas.h index e2f839ce9..8b374f859 100644 --- a/src/diagram/FlowCanvas.h +++ b/src/diagram/FlowCanvas.h @@ -78,7 +78,7 @@ class FlowCanvas : public ArrowCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/FragmentCanvas.cpp b/src/diagram/FragmentCanvas.cpp index febd599e8..d68fa4632 100644 --- a/src/diagram/FragmentCanvas.cpp +++ b/src/diagram/FragmentCanvas.cpp @@ -208,20 +208,16 @@ void FragmentCanvas::moveBy(double dx, double dy) { DiagramCanvas::moveBy(dx, dy); - Q3PtrListIterator it(separators); - - for (; it.current(); ++it) - it.current()->update(); + foreach (FragmentSeparatorCanvas *canvas, separators) + canvas->update(); } void FragmentCanvas::set_z(double z) { setZ(z); - Q3PtrListIterator it(separators); - - for (; it.current(); ++it) - it.current()->update(); + foreach (FragmentSeparatorCanvas *canvas, separators) + canvas->update(); } void FragmentCanvas::open() @@ -319,10 +315,8 @@ void FragmentCanvas::change_scale() recenter(); Q3CanvasRectangle::setVisible(TRUE); - Q3PtrListIterator it(separators); - - for (; it.current(); ++it) - it.current()->update(); + foreach (FragmentSeparatorCanvas *canvas, separators) + canvas->update(); } void FragmentCanvas::modified() @@ -481,7 +475,7 @@ bool FragmentCanvas::has_drawing_settings() const return TRUE; } -void FragmentCanvas::edit_drawing_settings(Q3PtrList & l) +void FragmentCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -494,11 +488,9 @@ void FragmentCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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() } } @@ -533,19 +525,15 @@ void FragmentCanvas::resize(aCorner c, int dx, int dy, QPoint & o) { DiagramCanvas::resize(c, dx, dy, o, min_width, min_height); - Q3PtrListIterator 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 it(separators); - - for (; it.current(); ++it) - it.current()->update(); + foreach (FragmentSeparatorCanvas *canvas, separators) + canvas->update(); } } @@ -603,10 +591,8 @@ void FragmentCanvas::save(QTextStream & st, bool ref, QString & warning) const save_xyzwh(st, this, "xyzwh"); - Q3PtrListIterator 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); @@ -673,10 +659,9 @@ void FragmentCanvas::history_save(QBuffer & b) const ::save((int) separators.count(), b); - Q3PtrListIterator it(separators); - for (; it.current(); ++it) - ::save(it.current(), b); + foreach (FragmentSeparatorCanvas *canvas, separators) + ::save(canvas, b); } void FragmentCanvas::history_load(QBuffer & b) @@ -724,8 +709,8 @@ void FragmentCanvas::history_hide() // for plug outs void FragmentCanvas::send(ToolCom * com, Q3CanvasItemList & all, - Q3PtrList & fragments, - Q3PtrList & refs) + QList & fragments, + QList & refs) { Q3CanvasItemList::Iterator cit; @@ -738,9 +723,7 @@ void FragmentCanvas::send(ToolCom * com, Q3CanvasItemList & all, 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); @@ -753,11 +736,11 @@ void FragmentCanvas::send(ToolCom * com, Q3CanvasItemList & all, com->write_unsigned(1); else { FragmentSeparatorCanvas ** v = new FragmentSeparatorCanvas *[sz]; - unsigned index; - Q3PtrListIterator 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 dad91a4b6..4d88e545a 100644 --- a/src/diagram/FragmentCanvas.h +++ b/src/diagram/FragmentCanvas.h @@ -47,7 +47,7 @@ class FragmentCanvas : public QObject, public DiagramCanvas QString name; int min_width; int min_height; - Q3PtrList separators; + QList separators; BrowserNode * refer; QString form; @@ -86,7 +86,7 @@ class FragmentCanvas : public QObject, public DiagramCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); @@ -97,8 +97,8 @@ class FragmentCanvas : public QObject, public DiagramCanvas } static void send(ToolCom * com, Q3CanvasItemList & all, - Q3PtrList & fragments, - Q3PtrList & refs); + QList & fragments, + QList & refs); private slots: void modified(); diff --git a/src/diagram/InfoCanvas.cpp b/src/diagram/InfoCanvas.cpp index b72675316..105743472 100644 --- a/src/diagram/InfoCanvas.cpp +++ b/src/diagram/InfoCanvas.cpp @@ -225,7 +225,7 @@ bool InfoCanvas::has_drawing_settings() const return TRUE; } -void InfoCanvas::edit_drawing_settings(Q3PtrList & l) +void InfoCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -238,11 +238,10 @@ void InfoCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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() } } diff --git a/src/diagram/InfoCanvas.h b/src/diagram/InfoCanvas.h index bfe1ec673..9470afc55 100644 --- a/src/diagram/InfoCanvas.h +++ b/src/diagram/InfoCanvas.h @@ -52,7 +52,7 @@ class InfoCanvas : public NoteCanvas virtual void apply_shortcut(QString s); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void save(QTextStream & st, bool ref, QString & warning) const; diff --git a/src/diagram/InterruptibleActivityRegionCanvas.cpp b/src/diagram/InterruptibleActivityRegionCanvas.cpp index d4ce4905c..3aa542e7f 100644 --- a/src/diagram/InterruptibleActivityRegionCanvas.cpp +++ b/src/diagram/InterruptibleActivityRegionCanvas.cpp @@ -401,7 +401,7 @@ bool InterruptibleActivityRegionCanvas::has_drawing_settings() const return TRUE; } -void InterruptibleActivityRegionCanvas::edit_drawing_settings(Q3PtrList & l) +void InterruptibleActivityRegionCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -414,11 +414,10 @@ void InterruptibleActivityRegionCanvas::edit_drawing_settings(Q3PtrList 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(); } } diff --git a/src/diagram/InterruptibleActivityRegionCanvas.h b/src/diagram/InterruptibleActivityRegionCanvas.h index c90b859cd..9ab84713b 100644 --- a/src/diagram/InterruptibleActivityRegionCanvas.h +++ b/src/diagram/InterruptibleActivityRegionCanvas.h @@ -80,7 +80,7 @@ class InterruptibleActivityRegionCanvas : public QObject, public ActivityContain virtual bool move_with_its_package() const; virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/NoteCanvas.cpp b/src/diagram/NoteCanvas.cpp index 78fa8e36c..3e174da4c 100644 --- a/src/diagram/NoteCanvas.cpp +++ b/src/diagram/NoteCanvas.cpp @@ -355,7 +355,7 @@ bool NoteCanvas::has_drawing_settings() const return TRUE; } -void NoteCanvas::edit_drawing_settings(Q3PtrList & l) +void NoteCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -368,11 +368,10 @@ void NoteCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/NoteCanvas.h b/src/diagram/NoteCanvas.h index 708f78c4a..5e040f0fd 100644 --- a/src/diagram/NoteCanvas.h +++ b/src/diagram/NoteCanvas.h @@ -75,7 +75,7 @@ class NoteCanvas : public QObject, public DiagramCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/ObjectDiagramView.cpp b/src/diagram/ObjectDiagramView.cpp index bd49d6c7a..7729141d3 100644 --- a/src/diagram/ObjectDiagramView.cpp +++ b/src/diagram/ObjectDiagramView.cpp @@ -247,7 +247,6 @@ void ObjectDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -257,7 +256,7 @@ 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()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlPackage: case UmlFragment: @@ -277,7 +276,7 @@ void ObjectDiagramView::save(QTextStream & st, QString & warning, // then save links - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { UmlCode k = di->type(); if (IsaRelation(k) || (k == UmlObjectLink)) { @@ -288,7 +287,7 @@ void ObjectDiagramView::save(QTextStream & st, QString & warning, // then save anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); diff --git a/src/diagram/ObjectLinkCanvas.cpp b/src/diagram/ObjectLinkCanvas.cpp index 0ba81f98b..5edfea09b 100644 --- a/src/diagram/ObjectLinkCanvas.cpp +++ b/src/diagram/ObjectLinkCanvas.cpp @@ -261,7 +261,7 @@ void ObjectLinkCanvas::open() last = (ObjectLinkCanvas *)((ArrowPointCanvas *) last->end)->get_other(last); // compute all compatible relations in the two directions - Q3PtrList l; + QList l; int nfirstdir; ((BrowserClass *)((OdClassInstCanvas *) first->begin)->get_type()) diff --git a/src/diagram/OdClassInstCanvas.cpp b/src/diagram/OdClassInstCanvas.cpp index d156b456f..dd9be4960 100644 --- a/src/diagram/OdClassInstCanvas.cpp +++ b/src/diagram/OdClassInstCanvas.cpp @@ -232,12 +232,10 @@ void OdClassInstCanvas::modified() if (the_canvas()->must_draw_all_relations()) draw_all_relations(); - Q3PtrListIterator it(lines); - - for (; it.current(); ++it) - if (IsaRelation(it.current()->type())) + foreach (ArrowCanvas *canvas, lines) + if (IsaRelation(canvas->type())) // 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 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->type()) && + (((ObjectLinkCanvas *) canvas) + ->is(slot_rel, canvas->get_start() == (DiagramItem *) this))) return TRUE; - ++it; - } - return FALSE; } @@ -271,18 +264,13 @@ bool OdClassInstCanvas::is_duplicated(ObjectLinkCanvas * lnk, OdClassInstCanvas * other) const { RelationData * rel = lnk->get_rel(); - Q3PtrListIterator 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)) return TRUE; - else - ++it; - } return FALSE; } @@ -706,7 +694,7 @@ bool OdClassInstCanvas::has_drawing_settings() const return TRUE; } -void OdClassInstCanvas::edit_drawing_settings(Q3PtrList & l) +void OdClassInstCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(2); @@ -724,21 +712,20 @@ void OdClassInstCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { + foreach (DiagramItem *item, l) { + OdClassInstCanvas *canvas = (OdClassInstCanvas *)item; if (!st[0].name.isEmpty()) - ((OdClassInstCanvas *) it.current())->write_horizontally = + canvas->write_horizontally = write_horizontally; if (!st[1].name.isEmpty()) - ((OdClassInstCanvas *) it.current())->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(); } } diff --git a/src/diagram/OdClassInstCanvas.h b/src/diagram/OdClassInstCanvas.h index 9beda0edf..b598f20db 100644 --- a/src/diagram/OdClassInstCanvas.h +++ b/src/diagram/OdClassInstCanvas.h @@ -86,7 +86,7 @@ class OdClassInstCanvas : public QObject, public DiagramCanvas, virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/PackageCanvas.cpp b/src/diagram/PackageCanvas.cpp index 595bda5a5..bfdface23 100644 --- a/src/diagram/PackageCanvas.cpp +++ b/src/diagram/PackageCanvas.cpp @@ -651,7 +651,7 @@ bool PackageCanvas::has_drawing_settings() const return TRUE; } -void PackageCanvas::edit_drawing_settings(Q3PtrList & l) +void PackageCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(3); @@ -671,22 +671,21 @@ void PackageCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/PackageCanvas.h b/src/diagram/PackageCanvas.h index 8d186aec6..f6e154eb3 100644 --- a/src/diagram/PackageCanvas.h +++ b/src/diagram/PackageCanvas.h @@ -77,7 +77,7 @@ class PackageCanvas : public QObject, public DiagramCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/ParameterCanvas.cpp b/src/diagram/ParameterCanvas.cpp index 4c472a1bd..323f0496a 100644 --- a/src/diagram/ParameterCanvas.cpp +++ b/src/diagram/ParameterCanvas.cpp @@ -511,7 +511,7 @@ bool ParameterCanvas::has_drawing_settings() const return TRUE; } -void ParameterCanvas::edit_drawing_settings(Q3PtrList & l) +void ParameterCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -524,11 +524,10 @@ void ParameterCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/ParameterCanvas.h b/src/diagram/ParameterCanvas.h index 11fec8831..6f98bec3e 100644 --- a/src/diagram/ParameterCanvas.h +++ b/src/diagram/ParameterCanvas.h @@ -79,7 +79,7 @@ class ParameterCanvas : public QObject, public DiagramCanvas bool activity_selected() const; virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/ParameterSetCanvas.cpp b/src/diagram/ParameterSetCanvas.cpp index c8a057117..05da369b6 100644 --- a/src/diagram/ParameterSetCanvas.cpp +++ b/src/diagram/ParameterSetCanvas.cpp @@ -436,7 +436,7 @@ bool ParameterSetCanvas::has_drawing_settings() const return TRUE; } -void ParameterSetCanvas::edit_drawing_settings(Q3PtrList & l) +void ParameterSetCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -449,11 +449,10 @@ void ParameterSetCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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() } } diff --git a/src/diagram/ParameterSetCanvas.h b/src/diagram/ParameterSetCanvas.h index c50c6a49f..42af6b3a3 100644 --- a/src/diagram/ParameterSetCanvas.h +++ b/src/diagram/ParameterSetCanvas.h @@ -77,7 +77,7 @@ class ParameterSetCanvas : public QObject, public DiagramCanvas void do_change_scale(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/PinCanvas.cpp b/src/diagram/PinCanvas.cpp index 88b22a5c4..2d8aaf94a 100644 --- a/src/diagram/PinCanvas.cpp +++ b/src/diagram/PinCanvas.cpp @@ -512,7 +512,7 @@ bool PinCanvas::has_drawing_settings() const return TRUE; } -void PinCanvas::edit_drawing_settings(Q3PtrList & l) +void PinCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -525,11 +525,10 @@ void PinCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/PinCanvas.h b/src/diagram/PinCanvas.h index ca1f67974..02072775d 100644 --- a/src/diagram/PinCanvas.h +++ b/src/diagram/PinCanvas.h @@ -76,7 +76,7 @@ class PinCanvas : public QObject, public DiagramCanvas bool action_selected() const; virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/RelationCanvas.cpp b/src/diagram/RelationCanvas.cpp index 535c69968..16c230f61 100644 --- a/src/diagram/RelationCanvas.cpp +++ b/src/diagram/RelationCanvas.cpp @@ -1232,12 +1232,7 @@ void RelationCanvas::show_assoc_class(CdClassCanvas * cc) for (;;) { // goes throw the line and check / search assoc - Q3PtrList l = rc->lines; - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { - ArrowCanvas * a = it.current(); - + foreach (ArrowCanvas *a, rc->lines) { if (a->type() == UmlAnchor) { DiagramItem * s = a->get_start(); DiagramItem * e = a->get_end(); @@ -1286,11 +1281,7 @@ void RelationCanvas::hide_assoc_class() for (;;) { // goes through the line to remove existing assoc - Q3PtrListIterator it(rc->lines); - - for (; it.current(); ++it) { - ArrowCanvas * a = it.current(); - + foreach (ArrowCanvas *a, rc->lines) { if ((a->type() == UmlAnchor) && ((a->get_start()->type() == UmlClass) || (a->get_end()->type() == UmlClass))) { diff --git a/src/diagram/SdClassInstCanvas.cpp b/src/diagram/SdClassInstCanvas.cpp index e3ce0671e..966638eb6 100644 --- a/src/diagram/SdClassInstCanvas.cpp +++ b/src/diagram/SdClassInstCanvas.cpp @@ -586,7 +586,7 @@ bool SdClassInstCanvas::has_drawing_settings() const return TRUE; } -void SdClassInstCanvas::edit_drawing_settings(Q3PtrList & l) +void SdClassInstCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(3); @@ -606,25 +606,24 @@ void SdClassInstCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { + foreach (DiagramItem *item, l) { + SdClassInstCanvas *canvas = (SdClassInstCanvas *)item; if (!st[0].name.isEmpty()) - ((SdClassInstCanvas *) it.current())->drawing_mode = + canvas->drawing_mode = drawing_mode; if (!st[1].name.isEmpty()) - ((SdClassInstCanvas *) it.current())->write_horizontally = + canvas->write_horizontally = write_horizontally; if (!st[2].name.isEmpty()) - ((SdClassInstCanvas *) it.current())->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() } } @@ -798,7 +797,7 @@ void SdClassInstCanvas::history_load(QBuffer & b) void SdClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all) { - Q3PtrList l; + QList l; Q3CanvasItemList::Iterator cit; for (cit = all.begin(); cit != all.end(); ++cit) { @@ -819,11 +818,7 @@ void SdClassInstCanvas::send(ToolCom * com, Q3CanvasItemList & all) com->write_unsigned(l.count()); - Q3PtrListIterator 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 8c603200f..47a2c6c2e 100644 --- a/src/diagram/SdClassInstCanvas.h +++ b/src/diagram/SdClassInstCanvas.h @@ -78,7 +78,7 @@ class SdClassInstCanvas : public QObject, public SdObjCanvas, public ClassInstCa virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/SdContinuationCanvas.cpp b/src/diagram/SdContinuationCanvas.cpp index f8dc3b579..b0f45545f 100644 --- a/src/diagram/SdContinuationCanvas.cpp +++ b/src/diagram/SdContinuationCanvas.cpp @@ -310,7 +310,7 @@ bool SdContinuationCanvas::has_drawing_settings() const return TRUE; } -void SdContinuationCanvas::edit_drawing_settings(Q3PtrList & l) +void SdContinuationCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -323,11 +323,10 @@ void SdContinuationCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/SdContinuationCanvas.h b/src/diagram/SdContinuationCanvas.h index 15754346f..3749427be 100644 --- a/src/diagram/SdContinuationCanvas.h +++ b/src/diagram/SdContinuationCanvas.h @@ -71,7 +71,7 @@ class SdContinuationCanvas : public QObject, public DiagramCanvas virtual void change_scale(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/SdDurationCanvas.cpp b/src/diagram/SdDurationCanvas.cpp index fa15429f7..7ea10e5fb 100644 --- a/src/diagram/SdDurationCanvas.cpp +++ b/src/diagram/SdDurationCanvas.cpp @@ -119,10 +119,8 @@ void SdDurationCanvas::update_hpos() { move(support->sub_x(width()), 100000); - Q3PtrListIterator itd(durations); - - for (; itd.current(); ++itd) - itd.current()->update_hpos(); + foreach (SdDurationCanvas *canvas, durations) + canvas->update_hpos(); } void SdDurationCanvas::draw(QPainter & p) @@ -202,10 +200,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 it(msgs); - - for (; it.current(); ++it) - it.current()->update_hpos(); + foreach (SdMsgBaseCanvas *canvas, msgs) + canvas->update_hpos(); } else { double my = min_y(); @@ -217,10 +213,8 @@ void SdDurationCanvas::moveBy(double dx, double dy) DiagramCanvas::moveBy(0, dy); // move messages (even selected, this case is managed by the messages) - Q3PtrListIterator 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 +226,10 @@ void SdDurationCanvas::prepare_for_move(bool on_resize) DiagramCanvas::prepare_for_move(on_resize); if (! on_resize) { - Q3PtrListIterator 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); } } } @@ -304,11 +296,10 @@ void SdDurationCanvas::update_v_to_contain(SdDurationCanvas * d, bool force) void SdDurationCanvas::update_self() { - Q3PtrListIterator 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 @@ -446,7 +437,7 @@ void SdDurationCanvas::add(SdMsgBaseCanvas * m) void SdDurationCanvas::remove(SdMsgBaseCanvas * m) { - msgs.removeRef(m); + msgs.remove(m); if (msgs.isEmpty() && durations.isEmpty()) // now useless, remove it @@ -469,20 +460,15 @@ void SdDurationCanvas::remove(SdDurationCanvas * d) void SdDurationCanvas::cut_internal(int py) { - Q3PtrListIterator 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 ms(msgs); - Q3PtrListIterator 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 @@ -494,17 +480,14 @@ void SdDurationCanvas::cut_internal(int py) 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 durs(durations); - Q3PtrListIterator 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 @@ -516,12 +499,12 @@ void SdDurationCanvas::cut_internal(int py) 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 +514,15 @@ void SdDurationCanvas::cut(const QPoint & p) package_modified(); } -void SdDurationCanvas::merge(Q3PtrList & l) +void SdDurationCanvas::merge(QList & l) { - l.removeRef(this); + l.remove(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) @@ -561,23 +543,17 @@ void SdDurationCanvas::merge(Q3PtrList & l) void SdDurationCanvas::collapse(SdDurationCanvas * d) { - Q3PtrList & 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 & 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(); } @@ -596,7 +572,7 @@ void SdDurationCanvas::go_up(SdMsgBaseCanvas * m, bool isdest) m->change_duration(this, d); d->update_hpos(); // update sub duration and msg hpos d->update_self(); - msgs.removeRef(m); + msgs.remove(m); m->upper(); } @@ -615,7 +591,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 +609,7 @@ void SdDurationCanvas::toOverlapping() unsigned index = 0; while (! msgs.isEmpty()) - v[index++] = msgs.take(0); + v[index++] = msgs.takeFirst(); unsigned sup = sz; @@ -719,17 +695,13 @@ void SdDurationCanvas::toOverlapping(SdMsgBaseCanvas ** v, void SdDurationCanvas::postToOverlapping() { - Q3PtrListIterator itd(durations); - - for (; itd.current(); ++itd) - itd.current()->postToOverlapping(); + foreach (SdDurationCanvas *canvas, durations) + canvas->postToOverlapping(); - Q3PtrListIterator 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 } } @@ -751,7 +723,7 @@ void SdDurationCanvas::menu(const QPoint & p) { Q3PopupMenu m(0); Q3CanvasItemList items = collisions(TRUE); - Q3PtrList l; + QList l; Q3CanvasItemList::ConstIterator it; Q3CanvasItemList::ConstIterator end = items.end(); @@ -899,7 +871,7 @@ bool SdDurationCanvas::has_drawing_settings() const return TRUE; } -void SdDurationCanvas::edit_drawing_settings(Q3PtrList & l) +void SdDurationCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -912,11 +884,10 @@ void SdDurationCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } @@ -992,11 +963,9 @@ void SdDurationCanvas::select_associated() if (! selected()) the_canvas()->select(this); - Q3PtrListIterator 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 @@ -1004,10 +973,8 @@ bool SdDurationCanvas::copyable() const if (! selected()) return FALSE; - Q3PtrListIterator it(msgs); - - for (; it.current(); ++it) - if (it.current()->copyable()) + foreach (SdMsgBaseCanvas *canvas, msgs) + if (canvas->copyable()) return TRUE; return FALSE; @@ -1045,29 +1012,21 @@ double SdDurationCanvas::getZ() const return z(); } -void SdDurationCanvas::propag_visible(Q3PtrList & l, bool y) +void SdDurationCanvas::propag_visible(QList & l, bool y) { - Q3PtrListIterator itd(l); - SdDurationCanvas * d; - - for (; (d = itd.current()) != 0; ++itd) { + foreach (SdDurationCanvas *d, l) { d->Q3CanvasItem::setVisible(y); - Q3PtrListIterator itm(d->msgs); - - for (; itm.current(); ++itm) - itm.current()->Q3CanvasItem::setVisible(y); + foreach (SdMsgBaseCanvas *msg, d->msgs) + msg->Q3CanvasItem::setVisible(y); propag_visible(d->durations, y); } } -void SdDurationCanvas::propag_dz(Q3PtrList & l, double dz) +void SdDurationCanvas::propag_dz(QList & l, double dz) { - Q3PtrListIterator it(l); - SdDurationCanvas * d; - - for (; (d = it.current()) != 0; ++it) { + foreach (SdDurationCanvas *d, l) { d->Q3CanvasItem::setZ(d->z() + dz); propag_dz(d->durations, dz); } @@ -1097,10 +1056,8 @@ void SdDurationCanvas::save_internal(QTextStream & st) const nl_indent(st); save_xyzwh(st, this, "xyzwh"); - Q3PtrListIterator itd(durations); - - for (; itd.current(); ++itd) - itd.current()->save_sub(st); + foreach (SdDurationCanvas *canvas, durations) + canvas->save_sub(st); indent(-1); nl_indent(st); @@ -1209,19 +1166,15 @@ void SdDurationCanvas::history_save(QBuffer & b) const ::save(height(), b); ::save_ptr(support, b); - Q3PtrListIterator it(msgs); - ::save((int) msgs.count(), b); - for (; it.current(); ++it) - ::save(it.current(), b); - - Q3PtrListIterator 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) @@ -1260,16 +1213,15 @@ void SdDurationCanvas::history_load(QBuffer & b) unsigned SdDurationCanvas::count_msg(int api_format) const { unsigned count = 0; - Q3PtrListIterator itm(msgs); double maxy = 0; bool isreturn = FALSE; - for (; itm.current(); ++itm) { - switch (itm.current()->type()) { + foreach (SdMsgBaseCanvas *canvas, msgs) { + switch (canvas->type()) { case UmlSyncMsg: case UmlAsyncMsg: case UmlReturnMsg: - if (itm.current()->get_dest() == (const SdMsgSupport *) this) + if (canvas->get_dest() == (const SdMsgSupport *) this) break; // no break @@ -1278,10 +1230,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->type()) { case UmlReturnMsg: case UmlSelfReturnMsg: isreturn = TRUE; @@ -1296,38 +1248,35 @@ unsigned SdDurationCanvas::count_msg(int api_format) const if (!isreturn) count += 1; - Q3PtrListIterator 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 itm(msgs); double maxy = 0; bool isreturn = FALSE; - for (; itm.current(); ++itm) { - switch (itm.current()->type()) { + foreach (SdMsgBaseCanvas *canvas, msgs) { + switch (canvas->type()) { 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->type()) { case UmlReturnMsg: case UmlSelfReturnMsg: isreturn = TRUE; @@ -1344,8 +1293,6 @@ void SdDurationCanvas::send(ToolCom * com, int id) const (unsigned) y() + height(), anImplicitReturn, "", "", ""); - Q3PtrListIterator 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 cdaeaca10..6467b24db 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 durations; - Q3PtrList msgs; + QList durations; + QList 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 &); + void merge(QList &); void collapse(SdDurationCanvas *); void toOverlapping(SdMsgBaseCanvas **, SdDurationCanvas * orig, unsigned & index, unsigned sz); @@ -119,7 +119,7 @@ class SdDurationCanvas : public QObject, public SdMsgSupport, public SdDurationS virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); @@ -132,8 +132,8 @@ class SdDurationCanvas : public QObject, public SdMsgSupport, public SdDurationS unsigned count_msg(int api_format) const; void send(ToolCom * com, int id) const; - static void propag_visible(Q3PtrList &, bool y); - static void propag_dz(Q3PtrList &, double dz); + static void propag_visible(QList &, bool y); + static void propag_dz(QList &, double dz); private slots: void modified(); diff --git a/src/diagram/SdLifeLineCanvas.cpp b/src/diagram/SdLifeLineCanvas.cpp index 01f061611..4124f409b 100644 --- a/src/diagram/SdLifeLineCanvas.cpp +++ b/src/diagram/SdLifeLineCanvas.cpp @@ -157,10 +157,8 @@ void SdLifeLineCanvas::moveBy(double dx, double dy) // not called by update_pos() which is only called by obj->moveBy() obj->moveBy(dx, 0); - Q3PtrListIterator it(durations); - - for (; it.current(); ++it) - it.current()->update_hpos(); + foreach (SdDurationCanvas *canvas, durations) + canvas->update_hpos(); } UmlCode SdLifeLineCanvas::type() const @@ -170,12 +168,11 @@ UmlCode SdLifeLineCanvas::type() const double SdLifeLineCanvas::instance_max_y() const { - Q3PtrListIterator 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; } @@ -264,18 +261,14 @@ void SdLifeLineCanvas::remove(SdDurationCanvas * d) void SdLifeLineCanvas::toFlat() { - Q3PtrListIterator it(durations); - - for (; it.current(); ++it) - it.current()->toFlat(); + foreach (SdDurationCanvas *canvas, durations) + canvas->toFlat(); } void SdLifeLineCanvas::toOverlapping() { - Q3PtrListIterator it(durations); - - for (; it.current(); ++it) - it.current()->toOverlapping(); + foreach (SdDurationCanvas *canvas, durations) + canvas->toOverlapping(); } void SdLifeLineCanvas::set_masked(bool y) @@ -288,11 +281,10 @@ void SdLifeLineCanvas::set_masked(bool y) void SdLifeLineCanvas::update_instance_dead() { if (obj->is_mortal() && !durations.isEmpty()) { - Q3PtrListIterator 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; @@ -420,10 +412,8 @@ void SdLifeLineCanvas::apply_shortcut(QString s) bool SdLifeLineCanvas::copyable() const { - Q3PtrListIterator it(durations); - - for (; it.current(); ++it) - if (it.current()->copyable()) + foreach (SdDurationCanvas *canvas, durations) + if (canvas->copyable()) return TRUE; return FALSE; @@ -440,10 +430,8 @@ void SdLifeLineCanvas::history_save(QBuffer & b) const ::save(end, b); ::save((int) durations.count(), b); - Q3PtrListIterator it(durations); - - for (; it.current(); ++it) - ::save(it.current(), b); + foreach (SdDurationCanvas *canvas, durations) + ::save(canvas, b); } void SdLifeLineCanvas::history_load(QBuffer & b) @@ -461,12 +449,12 @@ void SdLifeLineCanvas::history_load(QBuffer & b) } void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l, - Q3PtrList & fragments, - Q3PtrList & refs) + QList & fragments, + QList & refs) { int api_format = com->api_format(); Q3PtrDict used_refs; // the key is the fragment ref - Q3PtrList lls; + QList lls; Q3CanvasItemList::ConstIterator cit; unsigned n = 0; @@ -482,20 +470,16 @@ void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l, lls.append(ll); - Q3PtrListIterator 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()) { + foreach (FragmentCanvas *f, refs) { if (f->collidesWith(ll)) { // interaction use message if (used_refs.find((void *) f) == 0) { @@ -512,15 +496,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 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 @@ -534,6 +515,7 @@ void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l, if (com->api_format() >= 41) { // interaction use messages Q3PtrDictIteratoritref(used_refs); + SdLifeLineCanvas *ll; while ((ll = itref.current()) != 0) { FragmentCanvas * f = (FragmentCanvas *) itref.currentKey(); @@ -547,18 +529,16 @@ void SdLifeLineCanvas::send(ToolCom * com, const Q3CanvasItemList & l, } // send life lines covered by fragment - FragmentCanvas * f; - - for (f = fragments.first(); f != 0; f = fragments.next()) { - Q3PtrList covered; + foreach (FragmentCanvas *f, fragments) { + QList covered; - for (ll = lls.first(); ll != 0; ll = lls.next()) + foreach (SdLifeLineCanvas *ll, lls) if (f->collidesWith(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..88a248b48 100644 --- a/src/diagram/SdLifeLineCanvas.h +++ b/src/diagram/SdLifeLineCanvas.h @@ -44,7 +44,7 @@ class ToolCom; class SdLifeLineCanvas : public DiagramCanvas, public SdDurationSupport { protected: - Q3PtrList durations; + QList durations; SdObjCanvas * obj; int end; // 0 if masked by user, LIFE_LINE_HEIGHT if not mortal @@ -103,8 +103,8 @@ class SdLifeLineCanvas : public DiagramCanvas, public SdDurationSupport virtual void history_load(QBuffer &); static void send(ToolCom * com, const Q3CanvasItemList & l, - Q3PtrList & fragments, - Q3PtrList & refs); + QList & fragments, + QList & refs); }; #endif diff --git a/src/diagram/SdMsgCanvas.cpp b/src/diagram/SdMsgCanvas.cpp index 4e72754ac..aeb7e847c 100644 --- a/src/diagram/SdMsgCanvas.cpp +++ b/src/diagram/SdMsgCanvas.cpp @@ -430,7 +430,7 @@ bool SdMsgCanvas::has_drawing_settings() const return TRUE; } -void SdMsgCanvas::edit_drawing_settings(Q3PtrList & l) +void SdMsgCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(3); @@ -447,22 +447,21 @@ void SdMsgCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { + foreach (DiagramItem *item, l) { + SdMsgCanvas *canvas = (SdMsgCanvas *)item; if (!st[0].name.isEmpty()) - ((SdMsgCanvas *) it.current())->drawing_language = + canvas->drawing_language = drawing_language; if (!st[1].name.isEmpty()) - ((SdMsgCanvas *) it.current())->show_full_oper = + canvas->show_full_oper = show_full_oper; if (!st[2].name.isEmpty()) - ((SdMsgCanvas *) it.current())->show_context_mode = + canvas->show_context_mode = show_context_mode; - ((SdMsgCanvas *) it.current())->modified(); // call package_modified() + canvas->modified(); } } diff --git a/src/diagram/SdMsgCanvas.h b/src/diagram/SdMsgCanvas.h index bf4b6b99b..725e43b91 100644 --- a/src/diagram/SdMsgCanvas.h +++ b/src/diagram/SdMsgCanvas.h @@ -64,7 +64,7 @@ class SdMsgCanvas : public SdMsgBaseCanvas virtual bool copyable() const; virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); diff --git a/src/diagram/SdSelfMsgCanvas.cpp b/src/diagram/SdSelfMsgCanvas.cpp index 6125e3c86..0a3433ed6 100644 --- a/src/diagram/SdSelfMsgCanvas.cpp +++ b/src/diagram/SdSelfMsgCanvas.cpp @@ -411,7 +411,7 @@ bool SdSelfMsgCanvas::has_drawing_settings() const return TRUE; } -void SdSelfMsgCanvas::edit_drawing_settings(Q3PtrList & l) +void SdSelfMsgCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(3); @@ -428,22 +428,21 @@ void SdSelfMsgCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator it(l); - - for (; it.current(); ++it) { + foreach (DiagramItem *item, l) { + SdSelfMsgCanvas *canvas = (SdSelfMsgCanvas *)item; if (!st[0].name.isEmpty()) - ((SdSelfMsgCanvas *) it.current())->drawing_language = + canvas->drawing_language = drawing_language; if (!st[1].name.isEmpty()) - ((SdSelfMsgCanvas *) it.current())->show_full_oper = + canvas->show_full_oper = show_full_oper; if (!st[2].name.isEmpty()) - ((SdSelfMsgCanvas *) it.current())->show_context_mode = + canvas->show_context_mode = show_context_mode; - ((SdSelfMsgCanvas *) it.current())->modified(); // call package_modified() + canvas->modified(); } } diff --git a/src/diagram/SdSelfMsgCanvas.h b/src/diagram/SdSelfMsgCanvas.h index 33d8d866a..a25d8a510 100644 --- a/src/diagram/SdSelfMsgCanvas.h +++ b/src/diagram/SdSelfMsgCanvas.h @@ -53,7 +53,7 @@ class SdSelfMsgCanvas : public SdMsgBaseCanvas virtual void select_associated(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); diff --git a/src/diagram/SeqDiagramView.cpp b/src/diagram/SeqDiagramView.cpp index a085e2770..7ab397864 100644 --- a/src/diagram/SeqDiagramView.cpp +++ b/src/diagram/SeqDiagramView.cpp @@ -382,7 +382,6 @@ void SeqDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -392,7 +391,7 @@ 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()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlFragment: case UmlContinuation: @@ -413,21 +412,21 @@ 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->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->save(st, FALSE, warning); // then save messages - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlSyncMsg: case UmlAsyncMsg: @@ -449,7 +448,7 @@ void SeqDiagramView::save(QTextStream & st, QString & warning, // then save anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); @@ -510,8 +509,8 @@ void SeqDiagramView::read(char * st, char * k) void SeqDiagramView::send(ToolCom * com) { Q3CanvasItemList l = canvas()->allItems(); - Q3PtrList fragments; - Q3PtrList refs; + QList fragments; + QList refs; FragmentCanvas::send(com, l, fragments, refs); SdClassInstCanvas::send(com, l); diff --git a/src/diagram/StateActionCanvas.cpp b/src/diagram/StateActionCanvas.cpp index 088675497..abac42f82 100644 --- a/src/diagram/StateActionCanvas.cpp +++ b/src/diagram/StateActionCanvas.cpp @@ -655,7 +655,7 @@ bool StateActionCanvas::has_drawing_settings() const return TRUE; } -void StateActionCanvas::edit_drawing_settings(Q3PtrList & l) +void StateActionCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(2); @@ -673,19 +673,18 @@ void StateActionCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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() } } diff --git a/src/diagram/StateActionCanvas.h b/src/diagram/StateActionCanvas.h index 701862091..6df292cee 100644 --- a/src/diagram/StateActionCanvas.h +++ b/src/diagram/StateActionCanvas.h @@ -85,7 +85,7 @@ class StateActionCanvas : public QObject, public DiagramCanvas virtual void resize(const QSize & sz, bool w, bool h); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/StateCanvas.cpp b/src/diagram/StateCanvas.cpp index 167ca35ce..a8b20856c 100644 --- a/src/diagram/StateCanvas.cpp +++ b/src/diagram/StateCanvas.cpp @@ -1436,7 +1436,7 @@ bool StateCanvas::has_drawing_settings() const return TRUE; } -void StateCanvas::edit_drawing_settings(Q3PtrList & l) +void StateCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(3); @@ -1457,25 +1457,24 @@ void StateCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/StateCanvas.h b/src/diagram/StateCanvas.h index 3d530c6a9..6337f981b 100644 --- a/src/diagram/StateCanvas.h +++ b/src/diagram/StateCanvas.h @@ -100,7 +100,7 @@ class StateCanvas : public QObject, public DiagramCanvas, public MultipleDepende virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/StateDiagramView.cpp b/src/diagram/StateDiagramView.cpp index e041cf4f6..c3505d4c7 100644 --- a/src/diagram/StateDiagramView.cpp +++ b/src/diagram/StateDiagramView.cpp @@ -407,7 +407,6 @@ void StateDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -417,7 +416,7 @@ 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()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlState: case UmlStateAction: @@ -449,7 +448,7 @@ void StateDiagramView::save(QTextStream & st, QString & warning, // then saves relations - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { if (di->type() == UmlTransition) { if (!copy || di->copyable()) di->save(st, FALSE, warning); @@ -458,7 +457,7 @@ void StateDiagramView::save(QTextStream & st, QString & warning, // then saves anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); diff --git a/src/diagram/StereotypePropertiesCanvas.cpp b/src/diagram/StereotypePropertiesCanvas.cpp index b5cb3621a..210e07be8 100644 --- a/src/diagram/StereotypePropertiesCanvas.cpp +++ b/src/diagram/StereotypePropertiesCanvas.cpp @@ -227,7 +227,7 @@ bool StereotypePropertiesCanvas::has_drawing_settings() const return TRUE; } -void StereotypePropertiesCanvas::edit_drawing_settings(Q3PtrList & l) +void StereotypePropertiesCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -240,11 +240,10 @@ void StereotypePropertiesCanvas::edit_drawing_settings(Q3PtrList & dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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(); } } diff --git a/src/diagram/StereotypePropertiesCanvas.h b/src/diagram/StereotypePropertiesCanvas.h index c38c7f60a..1f99c599e 100644 --- a/src/diagram/StereotypePropertiesCanvas.h +++ b/src/diagram/StereotypePropertiesCanvas.h @@ -59,7 +59,7 @@ class StereotypePropertiesCanvas : public NoteCanvas virtual void apply_shortcut(QString s); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void save(QTextStream & st, bool ref, QString & warning) const; diff --git a/src/diagram/SubjectCanvas.cpp b/src/diagram/SubjectCanvas.cpp index d177d2300..94de04b40 100644 --- a/src/diagram/SubjectCanvas.cpp +++ b/src/diagram/SubjectCanvas.cpp @@ -318,7 +318,7 @@ bool SubjectCanvas::has_drawing_settings() const return TRUE; } -void SubjectCanvas::edit_drawing_settings(Q3PtrList & l) +void SubjectCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -331,11 +331,9 @@ void SubjectCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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() } } @@ -486,7 +484,7 @@ void SubjectCanvas::history_hide() void SubjectCanvas::send(ToolCom * com, Q3CanvasItemList & all) { - Q3PtrList subjects; + QList subjects; Q3CanvasItemList::Iterator cit; for (cit = all.begin(); cit != all.end(); ++cit) { @@ -500,11 +498,8 @@ void SubjectCanvas::send(ToolCom * com, Q3CanvasItemList & all) 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 1ffe23508..ca9283c6e 100644 --- a/src/diagram/SubjectCanvas.h +++ b/src/diagram/SubjectCanvas.h @@ -72,7 +72,7 @@ class SubjectCanvas : public QObject, public DiagramCanvas virtual void change_scale(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/TransitionCanvas.cpp b/src/diagram/TransitionCanvas.cpp index 00b783a17..e43fe095d 100644 --- a/src/diagram/TransitionCanvas.cpp +++ b/src/diagram/TransitionCanvas.cpp @@ -403,7 +403,7 @@ bool TransitionCanvas::has_drawing_settings() const return TRUE; } -void TransitionCanvas::edit_drawing_settings(Q3PtrList & l) +void TransitionCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st(3); @@ -421,23 +421,22 @@ void TransitionCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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() } } diff --git a/src/diagram/TransitionCanvas.h b/src/diagram/TransitionCanvas.h index 0ec0b015e..4300cb204 100644 --- a/src/diagram/TransitionCanvas.h +++ b/src/diagram/TransitionCanvas.h @@ -73,7 +73,7 @@ class TransitionCanvas : public ArrowCanvas virtual void history_hide(); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); virtual void apply_shortcut(QString s); diff --git a/src/diagram/UcClassCanvas.cpp b/src/diagram/UcClassCanvas.cpp index 16161112f..2a97160f8 100644 --- a/src/diagram/UcClassCanvas.cpp +++ b/src/diagram/UcClassCanvas.cpp @@ -757,7 +757,7 @@ bool UcClassCanvas::has_drawing_settings() const return TRUE; } -void UcClassCanvas::edit_drawing_settings(Q3PtrList & l) +void UcClassCanvas::edit_drawing_settings(QList & l) { for (;;) { StateSpecVector st; @@ -774,15 +774,15 @@ void UcClassCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if (dialog.exec() == QDialog::Accepted) { - Q3PtrListIterator 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(); } } @@ -840,14 +840,10 @@ QString UcClassCanvas::may_connect(UmlCode & l, const DiagramItem * dest) const bool UcClassCanvas::has_relation(BasicData * def) const { - Q3PtrListIterator it(lines); - - while (it.current()) { - if (IsaRelation(it.current()->type()) && - (((RelationCanvas *) it.current())->get_data() == def)) + foreach (ArrowCanvas *line, lines) { + if (IsaRelation(line->type()) && + (((RelationCanvas *) line)->get_data() == def)) return TRUE; - - ++it; } return FALSE; diff --git a/src/diagram/UcClassCanvas.h b/src/diagram/UcClassCanvas.h index eba211b59..e9ce2c774 100644 --- a/src/diagram/UcClassCanvas.h +++ b/src/diagram/UcClassCanvas.h @@ -80,7 +80,7 @@ class UcClassCanvas : public QObject, public DiagramCanvas virtual void set_z(double z); // only called by upper() & lower() virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); virtual bool get_show_stereotype_properties() const; diff --git a/src/diagram/UcUseCaseCanvas.cpp b/src/diagram/UcUseCaseCanvas.cpp index 780fdafc7..e8daf00bc 100644 --- a/src/diagram/UcUseCaseCanvas.cpp +++ b/src/diagram/UcUseCaseCanvas.cpp @@ -467,7 +467,7 @@ bool UcUseCaseCanvas::has_drawing_settings() const return TRUE; } -void UcUseCaseCanvas::edit_drawing_settings(Q3PtrList & l) +void UcUseCaseCanvas::edit_drawing_settings(QList & l) { for (;;) { ColorSpecVector co(1); @@ -480,11 +480,10 @@ void UcUseCaseCanvas::edit_drawing_settings(Q3PtrList & l) dialog.raise(); if ((dialog.exec() == QDialog::Accepted) && !co[0].name.isEmpty()) { - Q3PtrListIterator 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() } } @@ -705,8 +704,8 @@ void UcUseCaseCanvas::history_load(QBuffer & b) void UcUseCaseCanvas::send(ToolCom * com, Q3CanvasItemList & all) { - Q3PtrList lu; - Q3PtrList la; + QList lu; + QList la; Q3CanvasItemList::Iterator cit; for (cit = all.begin(); cit != all.end(); ++cit) { @@ -732,32 +731,25 @@ void UcUseCaseCanvas::send(ToolCom * com, Q3CanvasItemList & all) com->write_unsigned(lu.count()); - Q3PtrListIterator 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 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 lr; + QList lr; - for (itu.toFirst(); itu.current(); ++itu) { - Q3PtrListIterator itl(itu.current()->lines); - - 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(); @@ -770,8 +762,6 @@ void UcUseCaseCanvas::send(ToolCom * com, Q3CanvasItemList & all) com->write_unsigned(lr.count()); - Q3PtrListIterator 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 8a4199825..2df9df31e 100644 --- a/src/diagram/UcUseCaseCanvas.h +++ b/src/diagram/UcUseCaseCanvas.h @@ -71,7 +71,7 @@ class UcUseCaseCanvas : public QObject, public DiagramCanvas virtual void resize(const QSize & sz, bool w, bool h); virtual bool has_drawing_settings() const; - virtual void edit_drawing_settings(Q3PtrList &); + virtual void edit_drawing_settings(QList &); virtual void clone_drawing_settings(const DiagramItem *src); void edit_drawing_settings(); diff --git a/src/diagram/UmlCanvas.cpp b/src/diagram/UmlCanvas.cpp index ce149b00a..cb15fdbdd 100644 --- a/src/diagram/UmlCanvas.cpp +++ b/src/diagram/UmlCanvas.cpp @@ -37,7 +37,7 @@ #include "ArrowPointCanvas.h" #include "BrowserDiagram.h" -static Q3PtrList All; +static QList All; static const struct { int w; @@ -94,7 +94,7 @@ UmlCanvas::UmlCanvas(CanvasFormat f, BrowserDiagram * br_diag) UmlCanvas::~UmlCanvas() { - All.removeRef(this); + All.remove(this); } void UmlCanvas::set_view(DiagramView * v) @@ -302,9 +302,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(); diff --git a/src/diagram/UseCaseDiagramView.cpp b/src/diagram/UseCaseDiagramView.cpp index b52059bea..4e7ddbcb8 100644 --- a/src/diagram/UseCaseDiagramView.cpp +++ b/src/diagram/UseCaseDiagramView.cpp @@ -72,11 +72,8 @@ UseCaseDiagramView::UseCaseDiagramView(QWidget * parent, UmlCanvas * canvas, int // have marked elements not yet drawn ? static bool marked_not_yet_drawn(Q3PtrDict & drawn) { - const Q3PtrList & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; - - for (; (bn = it.current()) != 0; ++it) { + const QList & l = BrowserNode::marked_nodes(); + foreach (BrowserNode *bn, l) { UmlCode k = bn->get_type(); switch (k) { @@ -99,9 +96,7 @@ static bool marked_not_yet_drawn(Q3PtrDict & drawn) static void get_drawn(DiagramItemList & items, Q3PtrDict & drawn) { - DiagramItem * di; - - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { UmlCode k = di->type(); switch (k) { @@ -170,11 +165,9 @@ void UseCaseDiagramView::add_marked_elements(const QPoint & p, int x = p.x(); int y = p.y(); int future_y = y; - const Q3PtrList & l = BrowserNode::marked_nodes(); - Q3PtrListIterator it(l); - BrowserNode * bn; + const QList & l = BrowserNode::marked_nodes(); - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, l) { if (drawn[bn->get_data()] == 0) { DiagramCanvas * dc; @@ -221,7 +214,7 @@ 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(); @@ -264,10 +257,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 it(l); - BrowserNode * bn; - for (; (bn = it.current()) != 0; ++it) { + foreach (BrowserNode *bn, l) { if (drawn[bn->get_data()] == 0) { DiagramCanvas * dc; @@ -500,7 +491,6 @@ void UseCaseDiagramView::save(QTextStream & st, QString & warning, bool copy) const { DiagramItemList items(canvas()->allItems()); - DiagramItem * di; if (!copy) // sort is useless for a copy @@ -510,7 +500,7 @@ void UseCaseDiagramView::save(QTextStream & st, QString & warning, // save first class use_cases packages fragment subject notes and icons - for (di = items.first(); di != 0; di = items.next()) { + foreach (DiagramItem *di, items) { switch (di->type()) { case UmlClass: case UmlUseCase: @@ -532,14 +522,14 @@ void UseCaseDiagramView::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()) && (IsaRelation(di->type()) || IsaSimpleRelation(di->type()))) di->save(st, FALSE, warning); // then saves anchors - for (di = items.first(); di != 0; di = items.next()) + foreach (DiagramItem *di, items) if ((!copy || di->copyable()) && (di->type() == UmlAnchor)) di->save(st, FALSE, warning); @@ -591,8 +581,8 @@ void UseCaseDiagramView::read(char * st, char * k) void UseCaseDiagramView::send(ToolCom * com) { Q3CanvasItemList l = canvas()->allItems(); - Q3PtrList fragments; - Q3PtrList refs; + QList fragments; + QList refs; FragmentCanvas::send(com, l, fragments, refs); SubjectCanvas::send(com, l); diff --git a/src/dialog/ActivityActionDialog.cpp b/src/dialog/ActivityActionDialog.cpp index 4f7f6ea4e..d8f43e546 100644 --- a/src/dialog/ActivityActionDialog.cpp +++ b/src/dialog/ActivityActionDialog.cpp @@ -260,8 +260,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); } @@ -606,7 +607,7 @@ void AnyActionDialog::get_cond(QString & ocl_pre, QString & ocl_post, // opaque void OpaqueDialog::init(Q3TabDialog * t, ActivityActionData * act, - OpaqueAction * d, Q3PtrList & e, bool visit) + OpaqueAction * d, QList & e, bool visit) { edits = &e; td = t; @@ -832,7 +833,7 @@ bool AcceptEventDialog::update(AcceptEventAction * a) void ValueSpecificationDialog::init(Q3TabDialog * t, ActivityActionData * act, ValueSpecificationAction * d, - Q3PtrList & e, bool visit) + QList & e, bool visit) { edits = &e; td = t; @@ -1487,11 +1488,11 @@ void WithBehaviorDialog::init(BrowserNode * beh) behavior_co->insertItem(""); behavior_co->setAutoCompletion(completion()); - Q3PtrListIterator 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->insertItem(*(node->pixmap(0)), *iter_str); + ++iter_str; + } if (beh != 0) behavior_co->setCurrentItem(node_names->findIndex(beh->full_name(TRUE)) + 1); diff --git a/src/dialog/ActivityActionDialog.h b/src/dialog/ActivityActionDialog.h index b37364085..516810f20 100644 --- a/src/dialog/ActivityActionDialog.h +++ b/src/dialog/ActivityActionDialog.h @@ -85,14 +85,14 @@ class OpaqueDialog : public QObject, public AnyActionDialog Q_OBJECT private: - Q3PtrList * edits; + QList * edits; MultiLineEdit * ocl_beh; MultiLineEdit * cpp_beh; MultiLineEdit * java_beh; public: void init(Q3TabDialog *, ActivityActionData *, OpaqueAction *, - Q3PtrList & e, bool visit); + QList & e, bool visit); bool update(OpaqueAction *); static void post_edit_ocl(ActivityActionDialog * d, QString s); @@ -272,14 +272,14 @@ class ValueSpecificationDialog : public QObject, public AnyActionDialog Q_OBJECT private: - Q3PtrList * edits; + QList * edits; MultiLineEdit * ocl_val; MultiLineEdit * cpp_val; MultiLineEdit * java_val; public: void init(Q3TabDialog *, ActivityActionData *, - ValueSpecificationAction *, Q3PtrList & e, + ValueSpecificationAction *, QList & e, bool visit); bool update(ValueSpecificationAction *); @@ -387,7 +387,7 @@ class ActivityActionDialog : public Q3TabDialog QStringList class_names; BrowserNodeList behaviors; QStringList behavior_names; - Q3PtrList edits; + QList edits; OpaqueDialog opaque; AcceptEventDialog acceptevent; diff --git a/src/dialog/ActivityDialog.cpp b/src/dialog/ActivityDialog.cpp index 510a0122d..d8a4fca91 100644 --- a/src/dialog/ActivityDialog.cpp +++ b/src/dialog/ActivityDialog.cpp @@ -122,7 +122,7 @@ ActivityDialog::ActivityDialog(ActivityData * d) edspecification->insertStringList(list); edspecification->setCurrentItem((activity->get_specification() == 0) ? 0 - : opers.findRef(activity->get_specification()) + 1); + : opers.indexOf(activity->get_specification()) + 1); } new QLabel(grid); @@ -274,8 +274,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); } diff --git a/src/dialog/ActivityDialog.h b/src/dialog/ActivityDialog.h index 53bbff7a0..77bed83be 100644 --- a/src/dialog/ActivityDialog.h +++ b/src/dialog/ActivityDialog.h @@ -69,7 +69,7 @@ class ActivityDialog : public Q3TabDialog Q3ComboBox * edspecification; MultiLineEdit * comment; MultiLineEdit * constraint; - Q3PtrList edits; + QList edits; QCheckBox * readonly_cb; QCheckBox * singlexec_cb; QCheckBox * active_cb; diff --git a/src/dialog/ActivityObjectDialog.cpp b/src/dialog/ActivityObjectDialog.cpp index 83d0c2b7a..8244e5d74 100644 --- a/src/dialog/ActivityObjectDialog.cpp +++ b/src/dialog/ActivityObjectDialog.cpp @@ -247,8 +247,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); } diff --git a/src/dialog/ActivityObjectDialog.h b/src/dialog/ActivityObjectDialog.h index 51a269954..013a0ed9d 100644 --- a/src/dialog/ActivityObjectDialog.h +++ b/src/dialog/ActivityObjectDialog.h @@ -60,7 +60,7 @@ class ActivityObjectDialog : public Q3TabDialog ActivityObjectData * data; QStringList list; BrowserNodeList nodes; - Q3PtrList edits; + QList edits; int offset; BrowserNode * view; diff --git a/src/dialog/ActivityPartitionDialog.cpp b/src/dialog/ActivityPartitionDialog.cpp index 043ed2794..b0e25a1df 100644 --- a/src/dialog/ActivityPartitionDialog.cpp +++ b/src/dialog/ActivityPartitionDialog.cpp @@ -190,8 +190,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); } @@ -257,9 +258,9 @@ void ActivityPartitionDialog::menu_represents() if ((bn != 0) && allowed(bn)) m.insertItem(TR("Choose element selected in browser"), 1); - const Q3PtrList & l = BrowserNode::marked_nodes(); + const QList & l = BrowserNode::marked_nodes(); - if ((l.count() == 1) && allowed(l.getFirst())) + if ((l.count() == 1) && allowed(l.first())) m.insertItem(TR("Choose element marked in browser"), 2); switch (m.exec(QCursor::pos())) { @@ -272,7 +273,7 @@ void ActivityPartitionDialog::menu_represents() break; case 2: - represented = l.getFirst(); + represented = l.first(); break; default: diff --git a/src/dialog/ActivityPartitionDialog.h b/src/dialog/ActivityPartitionDialog.h index f87631ff2..3905f4cb8 100644 --- a/src/dialog/ActivityPartitionDialog.h +++ b/src/dialog/ActivityPartitionDialog.h @@ -61,7 +61,7 @@ class ActivityPartitionDialog : public Q3TabDialog QCheckBox * external_cb; MultiLineEdit * comment; KeyValuesTable * kvtable; - Q3PtrList edits; + QList edits; static QSize previous_size; diff --git a/src/dialog/ArtifactDialog.cpp b/src/dialog/ArtifactDialog.cpp index 033cbd6a0..e9a0436e9 100644 --- a/src/dialog/ArtifactDialog.cpp +++ b/src/dialog/ArtifactDialog.cpp @@ -117,8 +117,9 @@ 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(); if(toolbar) { @@ -556,12 +557,11 @@ void ArtifactDialog::init_assoc_classes_tab() 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))); @@ -1863,13 +1863,12 @@ void ArtifactDialog::stereotypeFilterActivated(const QString & st) QString s = st.stripWhiteSpace(); BrowserNodeList artifacts; BrowserNode * itself = data->browser_node; - BrowserNode * cp; BrowserArtifact::instances(artifacts, s); 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))); diff --git a/src/dialog/ArtifactDialog.h b/src/dialog/ArtifactDialog.h index badeafef5..13b25922c 100644 --- a/src/dialog/ArtifactDialog.h +++ b/src/dialog/ArtifactDialog.h @@ -65,7 +65,7 @@ class ArtifactDialog : public EdgeMenuDialog MultiLineEdit * comment; QMap formals; // to generate the associated QMap actuals; // classes definition - Q3PtrList edits; + QList edits; // c++ unsigned n_cpp; diff --git a/src/dialog/AttributeDialog.cpp b/src/dialog/AttributeDialog.cpp index fca61eac0..6d1eea8c1 100644 --- a/src/dialog/AttributeDialog.cpp +++ b/src/dialog/AttributeDialog.cpp @@ -642,8 +642,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 diff --git a/src/dialog/AttributeDialog.h b/src/dialog/AttributeDialog.h index 5c6c342c1..94b238794 100644 --- a/src/dialog/AttributeDialog.h +++ b/src/dialog/AttributeDialog.h @@ -63,7 +63,7 @@ class AttributeDialog : public Q3TabDialog AttributeData * att; QStringList list; BrowserNodeList nodes; - Q3PtrList edits; + QList edits; BrowserNode * view; int offset; diff --git a/src/dialog/BasicDialog.cpp b/src/dialog/BasicDialog.cpp index 0ab8b7155..f53c0e030 100644 --- a/src/dialog/BasicDialog.cpp +++ b/src/dialog/BasicDialog.cpp @@ -140,8 +140,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); } diff --git a/src/dialog/BasicDialog.h b/src/dialog/BasicDialog.h index 06b3f62a9..8ebf011cf 100644 --- a/src/dialog/BasicDialog.h +++ b/src/dialog/BasicDialog.h @@ -54,7 +54,7 @@ class BasicDialog : public Q3TabDialog MultiLineEdit * comment; KeyValuesTable * kvtable; QSize & previous_size; - Q3PtrList edits; + QList edits; static void post_edit_description(BasicDialog * d, QString s); diff --git a/src/dialog/BodyDialog.cpp b/src/dialog/BodyDialog.cpp index 57f51acda..1dc5f493c 100644 --- a/src/dialog/BodyDialog.cpp +++ b/src/dialog/BodyDialog.cpp @@ -46,7 +46,7 @@ QSize BodyDialog::previous_size; BodyDialog::BodyDialog(QString t, Q3TabDialog * d, post_edit pf, - EditType k, QString what, Q3PtrList & edits) + EditType k, QString what, QList & edits) : QDialog(d, what, d->isModal(), Qt::WDestructiveClose), dlg(d), f(pf), eds(edits) { eds.append(this); diff --git a/src/dialog/BodyDialog.h b/src/dialog/BodyDialog.h index 16f352a4a..3b5f79a96 100644 --- a/src/dialog/BodyDialog.h +++ b/src/dialog/BodyDialog.h @@ -45,13 +45,13 @@ class BodyDialog : public QDialog MultiLineEdit * e; Q3TabDialog * dlg; post_edit f; - Q3PtrList & eds; + QList & eds; static QSize previous_size; public: BodyDialog(QString t, Q3TabDialog * d, post_edit pf, - EditType k, QString what, Q3PtrList & edits); + EditType k, QString what, QList & edits); virtual ~BodyDialog(); }; diff --git a/src/dialog/BrowserSearchDialog.cpp b/src/dialog/BrowserSearchDialog.cpp index 307f7d2c2..4c1c0d949 100644 --- a/src/dialog/BrowserSearchDialog.cpp +++ b/src/dialog/BrowserSearchDialog.cpp @@ -247,9 +247,7 @@ void BrowserSearchDialog::search() if (! nodes.isEmpty()) { nodes.sort(); - BrowserNode * bn; - - for (bn = nodes.first(); bn != 0; bn = nodes.next()) + foreach (BrowserNode *bn, nodes) results->insertItem(*(bn->pixmap(0)), bn->full_name(TRUE)); selected(0); @@ -288,9 +286,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); diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp index c0c6ad82a..0811023c6 100644 --- a/src/dialog/ClassDialog.cpp +++ b/src/dialog/ClassDialog.cpp @@ -101,8 +101,10 @@ ClassDialog::~ClassDialog() { previous_size = size(); - while (!edits.isEmpty()) - edits.take(0)->close(); + foreach (BodyDialog *dialog, edits) + dialog->close(); + edits.clear(); + if(toolbar) { toolbar->setParent(0); @@ -437,10 +439,8 @@ static void cpp_generate_inherit(QString & s, ClassData * cl, BrowserNodeList inh; cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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; @@ -451,8 +451,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; } } @@ -466,10 +464,8 @@ static void cpp_generate_typedef_type(QString & s, ClassData * cl, cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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(); @@ -483,8 +479,6 @@ static void cpp_generate_typedef_type(QString & s, ClassData * cl, return; } } - - ++it; } s += GenerationSettings::cpp_type(type(basetype, node_names, nodes)); @@ -951,11 +945,9 @@ static void java_generate_extends(QString & s, const QString & stereotype, cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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; @@ -988,8 +980,6 @@ static void java_generate_extends(QString & s, const QString & stereotype, generate_mother(mother, FALSE, s, cl, actuals_table, nodes, node_names); } } - - ++it; } } @@ -1002,11 +992,9 @@ static void java_generate_implements(QString & s, const QString & stereotype, cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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(); @@ -1024,8 +1012,6 @@ static void java_generate_implements(QString & s, const QString & stereotype, generate_mother(mother, FALSE, s, cl, actuals_table, nodes, node_names); } } - - ++it; } } @@ -1246,11 +1232,9 @@ static void php_generate_extends(QString & s, const QString & stereotype, cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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; @@ -1280,8 +1264,6 @@ static void php_generate_extends(QString & s, const QString & stereotype, s += mother->get_name(); } } - - ++it; } } @@ -1293,11 +1275,9 @@ static void php_generate_implements(QString & s, const QString & stereotype, cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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(); @@ -1314,8 +1294,6 @@ static void php_generate_implements(QString & s, const QString & stereotype, s += mother->get_name(); } } - - ++it; } } @@ -1476,10 +1454,8 @@ static void python_generate_inherit(QString & s, ClassData * cl, bool object, cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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; @@ -1487,8 +1463,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 != '(') @@ -1673,10 +1647,8 @@ static void idl_generate_inherit(QString & s, QString st, ClassData * cl) cl->get_browser_node()->children(inh, UmlGeneralisation, UmlRealize); - Q3PtrListIterator 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(); @@ -1713,8 +1685,6 @@ static void idl_generate_inherit(QString & s, QString st, ClassData * cl) sep = ", "; } } - - ++it; } } @@ -2447,15 +2417,14 @@ void ActualParamsTable::generate(QString & s, ClassData * cl, BrowserNodeList & nodes, QStringList & node_names) { - ActualParamData * actual; - unsigned index; + unsigned index = 0; + QListIterator 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(); @@ -2464,7 +2433,7 @@ void ActualParamsTable::generate(QString & s, ClassData * cl, bool need_space = FALSE; // progress on still present formals - while (actual && (nth < n) && (actual->get_class() == parent)) { + while (it.hasNext() && (nth < n) && (it.next()->get_class() == parent)) { AType t = the_type(text(index, 1).stripWhiteSpace(), node_names, nodes); if (t.type != 0) { @@ -2501,7 +2470,6 @@ void ActualParamsTable::generate(QString & s, ClassData * cl, } sep = ", "; - actual = cl->actuals.next(); nth += 1; index += 1; } @@ -3117,7 +3085,7 @@ void ClassDialog::FillGuiElements(ClassData * _cl) artifact->setCurrentItem(artifacts.count()); } else - artifact->setCurrentItem(artifacts.find(bc) + 1); + artifact->setCurrentItem(artifacts.indexOf(bc) + 1); } else artifact->setCurrentItem(0); @@ -3448,16 +3416,12 @@ void ClassDialog::FillGuiElements(ClassData * _cl) edswitch_type->insertItem(cl->get_switch_type().get_full_type()); edswitch_type->insertStringList(GenerationSettings::basic_types()); - Q3PtrListIterator it(nodes); - - 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->insertItem(item->full_name(TRUE)); } } diff --git a/src/dialog/ClassDialog.h b/src/dialog/ClassDialog.h index 70303e4ed..29fb24ec2 100644 --- a/src/dialog/ClassDialog.h +++ b/src/dialog/ClassDialog.h @@ -85,7 +85,7 @@ class ClassDialog : public EdgeMenuDialog BrowserNodeList nodes; QStringList node_names; BrowserNodeList artifacts; - Q3PtrList edits; + QList edits; ActualParamsTable * actuals_table; Q3VBox * instantiate_vtab; diff --git a/src/dialog/ClassInstanceDialog.cpp b/src/dialog/ClassInstanceDialog.cpp index ee6b68692..884551e0c 100644 --- a/src/dialog/ClassInstanceDialog.cpp +++ b/src/dialog/ClassInstanceDialog.cpp @@ -187,7 +187,7 @@ ClassInstanceDialog::ClassInstanceDialog(ClassInstanceData * i) BrowserClass::instances(nodes); nodes.full_names(list); edtype->insertStringList(list); - edtype->setCurrentItem(nodes.find(inst->get_class())); + edtype->setCurrentItem(nodes.indexOf(inst->get_class())); connect(edtype, SIGNAL(activated(int)), this, SLOT(type_changed(int))); } @@ -272,8 +272,9 @@ 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); } @@ -339,8 +340,7 @@ void ClassInstanceDialog::menu_class() // no break case 1: { - - if ((index = nodes.findRef(bn)) == -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(); @@ -381,13 +381,10 @@ void ClassInstanceDialog::type_changed(int i) atbl->setNumRows(0); atbl->setNumRows(attributes.count()); - BrowserNode * at; - int index; Q3ValueList attrs = inst->attributes; - for (at = attributes.first(), index = 0; - at != 0; - at = attributes.next(), index += 1) { + int index = 0; + foreach (BrowserNode * at, attributes) { 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())); @@ -402,6 +399,7 @@ void ClassInstanceDialog::type_changed(int i) if (it_attr == attrs.end()) atbl->setText(index, 2, QString()); + ++index; } atbl->setColumnStretchable(2, TRUE); diff --git a/src/dialog/ClassInstanceDialog.h b/src/dialog/ClassInstanceDialog.h index 5519d7133..29db6012a 100644 --- a/src/dialog/ClassInstanceDialog.h +++ b/src/dialog/ClassInstanceDialog.h @@ -74,7 +74,7 @@ class ClassInstanceDialog : public Q3TabDialog BrowserNodeList attributes; BrowserNode * cl_container; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; MyTable * atbl; RelTable * rtbl; KeyValuesTable * kvtable; diff --git a/src/dialog/ClassViewDialog.cpp b/src/dialog/ClassViewDialog.cpp index 16a5f4b94..a79f53e89 100644 --- a/src/dialog/ClassViewDialog.cpp +++ b/src/dialog/ClassViewDialog.cpp @@ -132,7 +132,7 @@ ClassViewDialog::ClassViewDialog(BasicData * nd) deploymentview->setCurrentItem(deploymentviews.count()); } else - deploymentview->setCurrentItem(deploymentviews.find(bcv) + 1); + deploymentview->setCurrentItem(deploymentviews.indexOf(bcv) + 1); } else deploymentview->setCurrentItem(0); @@ -189,8 +189,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); } diff --git a/src/dialog/ClassViewDialog.h b/src/dialog/ClassViewDialog.h index 114cf0889..8baf8d5f1 100644 --- a/src/dialog/ClassViewDialog.h +++ b/src/dialog/ClassViewDialog.h @@ -54,7 +54,7 @@ class ClassViewDialog : public Q3TabDialog BrowserNodeList deploymentviews; MultiLineEdit * comment; KeyValuesTable * kvtable; - Q3PtrList edits; + QList edits; static QSize previous_size; diff --git a/src/dialog/CodAddMsgDialog.cpp b/src/dialog/CodAddMsgDialog.cpp index 7f6634b3e..f5624b9a3 100644 --- a/src/dialog/CodAddMsgDialog.cpp +++ b/src/dialog/CodAddMsgDialog.cpp @@ -85,11 +85,8 @@ CodAddMsgDialog::CodAddMsgDialog(CodObjCanvas * from, CodObjCanvas * to, from->get_all_in_all_out(all_in, all_out); - ColMsg * m; QStringList new_ones; - Q3PtrListIterator 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)) { @@ -98,9 +95,7 @@ CodAddMsgDialog::CodAddMsgDialog(CodObjCanvas * from, CodObjCanvas * to, } } - Q3PtrListIterator 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)) { diff --git a/src/dialog/ColMsgTable.cpp b/src/dialog/ColMsgTable.cpp index 37b1c51b7..8448eef2f 100644 --- a/src/dialog/ColMsgTable.cpp +++ b/src/dialog/ColMsgTable.cpp @@ -216,10 +216,7 @@ void ColMsgTable::refresh() void ColMsgTable::refresh(ColMsgList & m) { - ColMsg * msg; - Q3PtrListIterator it(m); - - for (; (msg = it.current()) != 0; ++it) { + foreach (ColMsg *msg, m) { QString def = msg->def(FALSE, TRUE, UmlView, DefaultShowContextMode); CodObjCanvas * from; CodObjCanvas * to; @@ -264,11 +261,7 @@ void ColMsgTable::save_list(ColMsgList & l, Q3PtrDict & saved) if (saved.find(&l) == 0) { saved.insert(&l, new ColMsgList(l)); - Q3PtrListIterator 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); } diff --git a/src/dialog/ComponentDialog.cpp b/src/dialog/ComponentDialog.cpp index c64f2d8bb..95281ec73 100644 --- a/src/dialog/ComponentDialog.cpp +++ b/src/dialog/ComponentDialog.cpp @@ -119,8 +119,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); } @@ -262,11 +263,10 @@ void ComponentDialog::rq_stereotypeFilterActivated(const QString & st) lb_rq_available->clear(); BrowserNodeList classes; - BrowserNode * cl; BrowserClass::instances(classes, st, TRUE); - for (cl = classes.first(); cl != 0; cl = classes.next()) + foreach (BrowserNode *cl, classes) if (rqs.findIndex((BrowserClass *) cl) == -1) lb_rq_available->insertItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE))); @@ -278,11 +278,10 @@ void ComponentDialog::pr_stereotypeFilterActivated(const QString & st) lb_pr_available->clear(); BrowserNodeList classes; - BrowserNode * cl; BrowserClass::instances(classes, st, TRUE); - for (cl = classes.first(); cl != 0; cl = classes.next()) + foreach (BrowserNode *cl, classes) if (prs.findIndex((BrowserClass *) cl) == -1) lb_pr_available->insertItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE))); @@ -294,11 +293,10 @@ void ComponentDialog::rz_stereotypeFilterActivated(const QString & st) lb_rz_available->clear(); BrowserNodeList classes; - BrowserNode * cl; BrowserClass::instances(classes, st, TRUE); - for (cl = classes.first(); cl != 0; cl = classes.next()) + foreach (BrowserNode *cl, classes) if (rzs.findIndex((BrowserClass *) cl) == -1) lb_rz_available->insertItem(new ListBoxBrowserNode(cl, cl->full_name(TRUE))); diff --git a/src/dialog/ComponentDialog.h b/src/dialog/ComponentDialog.h index b756d60bd..5b4d64598 100644 --- a/src/dialog/ComponentDialog.h +++ b/src/dialog/ComponentDialog.h @@ -63,7 +63,7 @@ class ComponentDialog : public Q3TabDialog LineEdit * edname; Q3ComboBox * edstereotype; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; // required classes Q3VBox * rq_page; diff --git a/src/dialog/ConstraintDialog.cpp b/src/dialog/ConstraintDialog.cpp index 7511e20c7..b5adfb52c 100644 --- a/src/dialog/ConstraintDialog.cpp +++ b/src/dialog/ConstraintDialog.cpp @@ -175,17 +175,15 @@ ConstraintTable::ConstraintTable(QWidget * parent, ConstraintCanvas * c) setColumnStretchable(0, FALSE); setColumnStretchable(1, FALSE); - int row; bool v = c->indicate_visible; Q3ValueList & hv = c->hidden_visible; BrowserNodeList & elts = c->elements; - BrowserNode * bn; QString yes = TR(" yes"); - QString empty; elts.sort(); - for (bn = elts.first(), row = 0; bn != 0; bn = elts.next(), row += 1) { + int row = 0; + foreach (BrowserNode *bn, elts) { if ((v) ? hv.findIndex(bn) != -1 : hv.findIndex(bn) == -1) setText(row, 0, yes); @@ -208,6 +206,7 @@ ConstraintTable::ConstraintTable(QWidget * parent, ConstraintCanvas * c) // note : adjustRow(row) does nothing setRowHeight(row, rowHeight(row) * (n + 1)); } + ++row; } adjustColumn(0); @@ -246,14 +245,15 @@ 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 empty; - for (bn = elts.first(), row = 0; bn != 0; bn = elts.next(), row += 1) + int row = 0; + foreach (BrowserNode *bn, elts) { setText(row, 0, ((bn == cl) || (bn->parent() == cl)) ? yes : empty); + ++row; + } } void ConstraintTable::update(ConstraintCanvas * c) @@ -261,12 +261,13 @@ void ConstraintTable::update(ConstraintCanvas * c) Q3ValueList & 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) + int row = 0; + foreach (BrowserNode *bn, elts) { if (text(row, 0).isEmpty() == empty_if_visible) list.append(bn); + ++row; + } } diff --git a/src/dialog/DialogUtil.cpp b/src/dialog/DialogUtil.cpp index c022e7d62..dcfe15362 100644 --- a/src/dialog/DialogUtil.cpp +++ b/src/dialog/DialogUtil.cpp @@ -247,7 +247,7 @@ void same_width(QWidget * l1, QWidget * l2, QWidget * l3, } void edit(const QString & s, QString name, void * id, EditType k, - Q3TabDialog * d, post_edit pf, Q3PtrList & edits) + Q3TabDialog * d, post_edit pf, QList & edits) { QString ed = DoumlEditor; @@ -321,7 +321,7 @@ void edit(const QString & s, QString name, void * id, EditType k, (new BodyDialog(s, d, pf, k, name, edits))->show(); } -bool check_edits(Q3PtrList & edits) +bool check_edits(QList & edits) { if (edits.isEmpty()) return TRUE; diff --git a/src/dialog/DialogUtil.h b/src/dialog/DialogUtil.h index a7396483c..b56835fa8 100644 --- a/src/dialog/DialogUtil.h +++ b/src/dialog/DialogUtil.h @@ -101,8 +101,8 @@ enum EditType { CppEdit, JavaEdit, PhpEdit, PythonEdit, TxtEdit }; typedef void (* post_edit)(Q3TabDialog *, QString); extern void edit(const QString &, QString name, void * id, EditType k, - Q3TabDialog * tbl, post_edit pf, Q3PtrList & edits); -extern bool check_edits(Q3PtrList & edits); + Q3TabDialog * tbl, post_edit pf, QList & edits); +extern bool check_edits(QList & edits); extern AType the_type(const QString & t, const QStringList & types, BrowserNodeList & nodes); diff --git a/src/dialog/ExpansionRegionDialog.cpp b/src/dialog/ExpansionRegionDialog.cpp index c2cadd245..81eeacb27 100644 --- a/src/dialog/ExpansionRegionDialog.cpp +++ b/src/dialog/ExpansionRegionDialog.cpp @@ -174,8 +174,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); } diff --git a/src/dialog/ExpansionRegionDialog.h b/src/dialog/ExpansionRegionDialog.h index 967acfba0..c236d0a9f 100644 --- a/src/dialog/ExpansionRegionDialog.h +++ b/src/dialog/ExpansionRegionDialog.h @@ -58,7 +58,7 @@ class ExpansionRegionDialog : public Q3TabDialog QCheckBox * must_isolate_cb; MultiLineEdit * comment; KeyValuesTable * kvtable; - Q3PtrList edits; + QList edits; static QSize previous_size; diff --git a/src/dialog/ExtraMemberDialog.cpp b/src/dialog/ExtraMemberDialog.cpp index d34cf4913..68f105e62 100644 --- a/src/dialog/ExtraMemberDialog.cpp +++ b/src/dialog/ExtraMemberDialog.cpp @@ -277,8 +277,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); } diff --git a/src/dialog/ExtraMemberDialog.h b/src/dialog/ExtraMemberDialog.h index b94b3cd75..aba4e6827 100644 --- a/src/dialog/ExtraMemberDialog.h +++ b/src/dialog/ExtraMemberDialog.h @@ -53,7 +53,7 @@ class ExtraMemberDialog : public Q3TabDialog protected: ExtraMemberData * emd; - Q3PtrList edits; + QList edits; // uml tab LineEdit * edname; diff --git a/src/dialog/FlowDialog.cpp b/src/dialog/FlowDialog.cpp index a62000a5c..d7d720ee9 100644 --- a/src/dialog/FlowDialog.cpp +++ b/src/dialog/FlowDialog.cpp @@ -154,8 +154,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); } diff --git a/src/dialog/FlowDialog.h b/src/dialog/FlowDialog.h index eb628d38e..03337f885 100644 --- a/src/dialog/FlowDialog.h +++ b/src/dialog/FlowDialog.h @@ -67,7 +67,7 @@ class FlowDialog : public Q3TabDialog LineEdit * edname; Q3ComboBox * edstereotype; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; FlDialog uml; FlDialog cpp; diff --git a/src/dialog/FragmentDialog.cpp b/src/dialog/FragmentDialog.cpp index 555381859..887bbfc30 100644 --- a/src/dialog/FragmentDialog.cpp +++ b/src/dialog/FragmentDialog.cpp @@ -59,7 +59,6 @@ FragmentDialog::FragmentDialog(const QStringList & defaults, QString & s, QLabel * lbl1; QLabel * lbl2; SmallPushButton * refer_bt; - BrowserNode * bn; vbox->setMargin(5); @@ -86,12 +85,12 @@ FragmentDialog::FragmentDialog(const QStringList & defaults, QString & s, BrowserDiagram::instances(nodes, TRUE); diag_cb->insertItem(""); - for (bn = nodes.first(); bn != 0; bn = nodes.next()) + foreach (BrowserNode *bn, nodes) diag_cb->insertItem(*(bn->pixmap(0)), bn->full_name(TRUE)); diag_cb->setCurrentItem((refer == 0) ? 0 - : nodes.findRef(refer) + 1); + : nodes.indexOf(refer) + 1); diag_cb->setSizePolicy(sp); hbox->addWidget(diag_cb); @@ -162,7 +161,7 @@ void FragmentDialog::menu_refer() break; case 1: - diag_cb->setCurrentItem(nodes.findRef(bn) + 1); + diag_cb->setCurrentItem(nodes.indexOf(bn) + 1); break; default: diff --git a/src/dialog/HideShowDialog.cpp b/src/dialog/HideShowDialog.cpp index d149190dd..b9e5ff5b5 100644 --- a/src/dialog/HideShowDialog.cpp +++ b/src/dialog/HideShowDialog.cpp @@ -89,16 +89,12 @@ HideShowDialog::HideShowDialog(const BrowserNodeList & a, subvbox->addWidget(lb_hidden = new Q3ListBox(this)); lb_hidden->setSelectionMode(Q3ListBox::Multi); - Q3PtrListIterator it(all); + foreach (BrowserNode *item, all) { + QString def = item->get_data()->definition(TRUE, FALSE); - while (it.current() != 0) { - QString def = it.current()->get_data()->definition(TRUE, FALSE); - - (((hidden_visible.findIndex(it.current()) == -1) ^ on_visible) + (((hidden_visible.findIndex(item) == -1) ^ on_visible) ? lb_visible : lb_hidden) - ->insertItem(new ListBoxBrowserNode(it.current(), def)); - - ++it; + ->insertItem(new ListBoxBrowserNode(item, def)); } lb_visible->sort(); @@ -224,17 +220,13 @@ void HideShowDialog::hide_private() lb_visible->clear(); lb_hidden->clear(); - Q3PtrListIterator 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; + ->insertItem(new ListBoxBrowserNode(item, def)); } lb_visible->sort(); @@ -246,19 +238,15 @@ void HideShowDialog::hide_private_protected() lb_visible->clear(); lb_hidden->clear(); - Q3PtrListIterator 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; + ->insertItem(new ListBoxBrowserNode(item, def)); } lb_visible->sort(); diff --git a/src/dialog/InstanceDialog.cpp b/src/dialog/InstanceDialog.cpp index f861671ef..f6c10313b 100644 --- a/src/dialog/InstanceDialog.cpp +++ b/src/dialog/InstanceDialog.cpp @@ -78,7 +78,7 @@ InstanceDialog::InstanceDialog(Instance * i, QString w, UmlCode k) inst->get_types(nodes); nodes.full_names(list); edtype->insertStringList(list); - edtype->setCurrentItem(nodes.find(inst->get_type())); + edtype->setCurrentItem(nodes.indexOf(inst->get_type())); new QLabel("", grid); new QLabel("", grid); diff --git a/src/dialog/ObjectLinkDialog.cpp b/src/dialog/ObjectLinkDialog.cpp index 1b3f07d62..47cb95b70 100644 --- a/src/dialog/ObjectLinkDialog.cpp +++ b/src/dialog/ObjectLinkDialog.cpp @@ -51,7 +51,7 @@ QSize ObjectLinkDialog::previous_size; ObjectLinkDialog::ObjectLinkDialog(BrowserClassInstance * a, BrowserClassInstance * b, - Q3PtrList & l, RelationData * current, + QList & l, RelationData * current, int nfirstdir) : QDialog(0, "object link dialog", TRUE), rels(l), nforward(nfirstdir), clia(a), clib(b), choozen(0), reverse(FALSE) @@ -151,14 +151,14 @@ void ObjectLinkDialog::init(RelationData * current) ((ClassInstanceData *) clia->get_data())->get_class()->get_name(); rb = clib->get_name() + QString(":") + ((ClassInstanceData *) clib->get_data())->get_class()->get_name(); - Q3PtrListIterator iter(rels); - int row; + QListIterator 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; @@ -171,7 +171,7 @@ void ObjectLinkDialog::init(RelationData * current) if (current != 0) { // select the current relation Q3TableSelection sel; - int row = rels.findRef(current); + int row = rels.indexOf(current); sel.init(row, 0); sel.expandTo(row, 4); diff --git a/src/dialog/ObjectLinkDialog.h b/src/dialog/ObjectLinkDialog.h index a84ed5853..bd748b2ef 100644 --- a/src/dialog/ObjectLinkDialog.h +++ b/src/dialog/ObjectLinkDialog.h @@ -42,7 +42,7 @@ class ObjectLinkDialog : public QDialog public: ObjectLinkDialog(BrowserClassInstance * a, BrowserClassInstance * b, - Q3PtrList & l, RelationData * current, + QList & l, RelationData * current, int nfirstdir); virtual ~ObjectLinkDialog(); @@ -56,7 +56,7 @@ class ObjectLinkDialog : public QDialog protected: void init(RelationData * current); - Q3PtrList & rels; + QList & rels; int nforward; int ninputrels; BrowserClassInstance * clia; diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 3bb438efe..6eca9e2ed 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -115,8 +115,9 @@ OperationDialog::~OperationDialog() // oper->browser_node->edit_end(); previous_size = size(); - while (!edits.isEmpty()) - edits.take(0)->close(); + foreach (BodyDialog *dialog, edits) + dialog->close(); + edits.clear(); if(toolbar) { diff --git a/src/dialog/OperationDialog.h b/src/dialog/OperationDialog.h index 9a0220f92..762fe794e 100644 --- a/src/dialog/OperationDialog.h +++ b/src/dialog/OperationDialog.h @@ -72,7 +72,7 @@ class OperationDialog : public EdgeMenuDialog ClassData * cl; QStringList list; BrowserNodeList nodes; - Q3PtrList edits; + QList edits; BrowserNode * view; AttributeData * get_of_attr; AttributeData * set_of_attr; diff --git a/src/dialog/OperationListDialog.cpp b/src/dialog/OperationListDialog.cpp index d3bc051a5..dc0ed8a80 100644 --- a/src/dialog/OperationListDialog.cpp +++ b/src/dialog/OperationListDialog.cpp @@ -48,7 +48,7 @@ QSize OperationListDialog::previous_size; OperationListDialog::OperationListDialog(const char * m, - Q3PtrList & l) + QList & l) : QDialog(0, m, TRUE) { setCaption(m); @@ -62,7 +62,7 @@ OperationListDialog::OperationListDialog(const char * m, cb = new Q3ComboBox(FALSE, 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); diff --git a/src/dialog/OperationListDialog.h b/src/dialog/OperationListDialog.h index 3c13c1ac8..c037ad7cd 100644 --- a/src/dialog/OperationListDialog.h +++ b/src/dialog/OperationListDialog.h @@ -43,7 +43,7 @@ class OperationListDialog : public QDialog static QSize previous_size; public: - OperationListDialog(const char * m, Q3PtrList & l); + OperationListDialog(const char * m, QList & l); virtual ~OperationListDialog(); int choosen(); diff --git a/src/dialog/PackageDialog.cpp b/src/dialog/PackageDialog.cpp index d5abf833a..fecf8d5e3 100644 --- a/src/dialog/PackageDialog.cpp +++ b/src/dialog/PackageDialog.cpp @@ -494,8 +494,9 @@ 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); } diff --git a/src/dialog/PackageDialog.h b/src/dialog/PackageDialog.h index 52dd93980..e86e374fe 100644 --- a/src/dialog/PackageDialog.h +++ b/src/dialog/PackageDialog.h @@ -54,7 +54,7 @@ class PackageDialog : public Q3TabDialog LineEdit * edname; Q3ComboBox * edstereotype; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; // C++ QWidget * cppTab; diff --git a/src/dialog/ParameterDialog.cpp b/src/dialog/ParameterDialog.cpp index c75ce93fe..8367d224b 100644 --- a/src/dialog/ParameterDialog.cpp +++ b/src/dialog/ParameterDialog.cpp @@ -311,8 +311,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); } diff --git a/src/dialog/ParameterDialog.h b/src/dialog/ParameterDialog.h index 7d6a2c662..a3890bba4 100644 --- a/src/dialog/ParameterDialog.h +++ b/src/dialog/ParameterDialog.h @@ -60,7 +60,7 @@ class ParameterDialog : public Q3TabDialog ParameterData * param; QStringList list; BrowserNodeList nodes; - Q3PtrList edits; + QList edits; BrowserNode * view; int offset; diff --git a/src/dialog/ParameterSetDialog.cpp b/src/dialog/ParameterSetDialog.cpp index 8a51b3de4..85f97a753 100644 --- a/src/dialog/ParameterSetDialog.cpp +++ b/src/dialog/ParameterSetDialog.cpp @@ -99,8 +99,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); } diff --git a/src/dialog/ParameterSetDialog.h b/src/dialog/ParameterSetDialog.h index f7db2a500..d8e80eacc 100644 --- a/src/dialog/ParameterSetDialog.h +++ b/src/dialog/ParameterSetDialog.h @@ -59,7 +59,7 @@ class ParameterSetDialog : public Q3TabDialog LineEdit * edname; Q3ComboBox * edstereotype; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; // associated classes Q3ListBox * lb_available; diff --git a/src/dialog/PinDialog.cpp b/src/dialog/PinDialog.cpp index 8d4f4f18f..5cb7699bd 100644 --- a/src/dialog/PinDialog.cpp +++ b/src/dialog/PinDialog.cpp @@ -298,8 +298,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); } diff --git a/src/dialog/PinDialog.h b/src/dialog/PinDialog.h index 35471d513..9b92e9080 100644 --- a/src/dialog/PinDialog.h +++ b/src/dialog/PinDialog.h @@ -60,7 +60,7 @@ class PinDialog : public Q3TabDialog PinData * pin; QStringList list; BrowserNodeList nodes; - Q3PtrList edits; + QList edits; BrowserNode * view; int offset; diff --git a/src/dialog/PseudoStateDialog.cpp b/src/dialog/PseudoStateDialog.cpp index 549acb292..bd3591987 100644 --- a/src/dialog/PseudoStateDialog.cpp +++ b/src/dialog/PseudoStateDialog.cpp @@ -167,7 +167,7 @@ PseudoStateDialog::PseudoStateDialog(PseudoStateData * ps) edreference->insertStringList(reflist); edreference->setCurrentItem((ref == 0) ? 0 - : pseudostates.findRef(ref) + 1); + : pseudostates.indexOf(ref) + 1); } } else @@ -217,8 +217,9 @@ 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); } diff --git a/src/dialog/PseudoStateDialog.h b/src/dialog/PseudoStateDialog.h index 28ace4a28..90136639d 100644 --- a/src/dialog/PseudoStateDialog.h +++ b/src/dialog/PseudoStateDialog.h @@ -60,7 +60,7 @@ class PseudoStateDialog : public Q3TabDialog Q3ComboBox * edreference; MultiLineEdit * comment; KeyValuesTable * kvtable; - Q3PtrList edits; + QList edits; static QSize previous_size; diff --git a/src/dialog/ReferenceDialog.cpp b/src/dialog/ReferenceDialog.cpp index bb2a030a5..e68d27997 100644 --- a/src/dialog/ReferenceDialog.cpp +++ b/src/dialog/ReferenceDialog.cpp @@ -115,35 +115,33 @@ void ReferenceDialog::compute() { QApplication::setOverrideCursor(Qt::waitCursor); - Q3PtrList l; - BrowserNode * bn; + QList 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) + QStringList::Iterator it = names.begin(); + foreach (BrowserNode * bn, nodes) { results->insertItem(*(bn->pixmap(0)), *it); + ++it; + } selected((nodes.isEmpty()) ? -1 : 0); @@ -178,9 +176,7 @@ 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); diff --git a/src/dialog/RelatedElementsDialog.cpp b/src/dialog/RelatedElementsDialog.cpp index 196420bb0..484a44d59 100644 --- a/src/dialog/RelatedElementsDialog.cpp +++ b/src/dialog/RelatedElementsDialog.cpp @@ -162,14 +162,9 @@ void RelatedElementsDialog::accept() do { BrowserNodeList newones; - Q3PtrListIterator 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()) { diff --git a/src/dialog/RelationDialog.cpp b/src/dialog/RelationDialog.cpp index 9ff620954..2460c25b8 100644 --- a/src/dialog/RelationDialog.cpp +++ b/src/dialog/RelationDialog.cpp @@ -456,8 +456,9 @@ 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); } diff --git a/src/dialog/RelationDialog.h b/src/dialog/RelationDialog.h index 1f9ee7252..550c2b093 100644 --- a/src/dialog/RelationDialog.h +++ b/src/dialog/RelationDialog.h @@ -160,7 +160,7 @@ class RelationDialog : public Q3TabDialog Q3GroupBox * php_b; Q3GroupBox * python_b; Q3GroupBox * idl_b; - Q3PtrList edits; + QList edits; BrowserNode * view; int offset; diff --git a/src/dialog/SimpleRelationDialog.cpp b/src/dialog/SimpleRelationDialog.cpp index c7b02b3b8..a2130a741 100644 --- a/src/dialog/SimpleRelationDialog.cpp +++ b/src/dialog/SimpleRelationDialog.cpp @@ -152,8 +152,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); } diff --git a/src/dialog/SimpleRelationDialog.h b/src/dialog/SimpleRelationDialog.h index a55ff4883..cab7d22c4 100644 --- a/src/dialog/SimpleRelationDialog.h +++ b/src/dialog/SimpleRelationDialog.h @@ -49,7 +49,7 @@ class SimpleRelationDialog : public Q3TabDialog Q3ComboBox * edstereotype; MultiLineEdit * comment; KeyValuesTable * kvtable; - Q3PtrList edits; + QList edits; static QSize previous_size; diff --git a/src/dialog/StateActionDialog.cpp b/src/dialog/StateActionDialog.cpp index caccdb117..ecf5bfbc2 100644 --- a/src/dialog/StateActionDialog.cpp +++ b/src/dialog/StateActionDialog.cpp @@ -180,8 +180,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); } diff --git a/src/dialog/StateActionDialog.h b/src/dialog/StateActionDialog.h index 6041711c9..3213dbc3b 100644 --- a/src/dialog/StateActionDialog.h +++ b/src/dialog/StateActionDialog.h @@ -55,7 +55,7 @@ class StateActionDialog : public Q3TabDialog StateActionData * action; Q3ComboBox * edstereotype; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; QWidget * umltab; QWidget * cppTab; diff --git a/src/dialog/StateDialog.cpp b/src/dialog/StateDialog.cpp index b4c23c0c3..7c6eff91d 100644 --- a/src/dialog/StateDialog.cpp +++ b/src/dialog/StateDialog.cpp @@ -123,7 +123,7 @@ StateDialog::StateDialog(StateData * d) edspecification->insertStringList(speclist); edspecification->setCurrentItem((state->get_specification() == 0) ? 0 - : opers.findRef(state->get_specification()) + 1); + : opers.indexOf(state->get_specification()) + 1); } switch (((BrowserNode *) bn->parent())->get_type()) { @@ -148,16 +148,14 @@ StateDialog::StateDialog(StateData * d) if (((BrowserState *) bn)->can_reference()) { BrowserState::instances(states, TRUE); - BrowserNode * st = states.first(); + QMutableListIterator 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 @@ -167,7 +165,7 @@ StateDialog::StateDialog(StateData * d) edreference->insertStringList(reflist); edreference->setCurrentItem((state->get_reference() == 0) ? 0 - : states.findRef(state->get_reference()) + 1); + : states.indexOf(state->get_reference()) + 1); connect(edreference, SIGNAL(activated(int)), this, SLOT(ed_ref_activated(int))); } @@ -243,8 +241,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); } diff --git a/src/dialog/StateDialog.h b/src/dialog/StateDialog.h index 83db93fd7..7013eae25 100644 --- a/src/dialog/StateDialog.h +++ b/src/dialog/StateDialog.h @@ -74,7 +74,7 @@ class StateDialog : public Q3TabDialog Q3ComboBox * edreference; QCheckBox * active_cb; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; QWidget * ocltab; QWidget * cppTab; diff --git a/src/dialog/TransitionDialog.cpp b/src/dialog/TransitionDialog.cpp index 2b62bd2a8..5435f0d54 100644 --- a/src/dialog/TransitionDialog.cpp +++ b/src/dialog/TransitionDialog.cpp @@ -157,8 +157,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); } diff --git a/src/dialog/TransitionDialog.h b/src/dialog/TransitionDialog.h index 98781f3fe..07edf72aa 100644 --- a/src/dialog/TransitionDialog.h +++ b/src/dialog/TransitionDialog.h @@ -68,7 +68,7 @@ class TransitionDialog : public Q3TabDialog QCheckBox * internal_cb; Q3ComboBox * edstereotype; MultiLineEdit * comment; - Q3PtrList edits; + QList edits; QWidget * ocltab; QWidget * cppTab; diff --git a/src/dialog/UseCaseDialog.cpp b/src/dialog/UseCaseDialog.cpp index 4a35460f7..62379f17b 100644 --- a/src/dialog/UseCaseDialog.cpp +++ b/src/dialog/UseCaseDialog.cpp @@ -143,8 +143,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); } diff --git a/src/dialog/UseCaseDialog.h b/src/dialog/UseCaseDialog.h index 0bd1883bc..379e5a374 100644 --- a/src/dialog/UseCaseDialog.h +++ b/src/dialog/UseCaseDialog.h @@ -53,7 +53,7 @@ class UseCaseDialog : public Q3TabDialog MultiLineEdit * extension_points; MultiLineEdit * comment; KeyValuesTable * kvtable; - Q3PtrList edits; + QList edits; static QSize previous_size; diff --git a/src/misc/Labeled.cpp b/src/misc/Labeled.cpp index f31b7fe40..7ad152c25 100644 --- a/src/misc/Labeled.cpp +++ b/src/misc/Labeled.cpp @@ -189,7 +189,7 @@ struct NeedChange { NeedChange(IdDict & d, int & id, void * e) : dict(d), ident(id), elt(e) {} }; -static Q3PtrList MustBeRenumered; +static QList MustBeRenumered; void will_change_id(IdDict & d, int & id, void * x) { @@ -201,7 +201,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/ProfiledStereotypes.cpp b/src/misc/ProfiledStereotypes.cpp index 065684665..387bcf1f4 100644 --- a/src/misc/ProfiledStereotypes.cpp +++ b/src/misc/ProfiledStereotypes.cpp @@ -945,7 +945,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) && diff --git a/src/misc/myio.cpp b/src/misc/myio.cpp index b03b93990..64974d9e8 100644 --- a/src/misc/myio.cpp +++ b/src/misc/myio.cpp @@ -1528,7 +1528,6 @@ void delete_backup(QDir & d) QFileInfoList l = d.entryInfoList(s); if (!l.empty()) { - //Q3PtrListIterator it(l); QFileInfoList::iterator it = l.begin(); //[lgfreitas] above iterator was not working. //QFileInfo fi; diff --git a/src/tool/ToolCom.cpp b/src/tool/ToolCom.cpp index 837b29c26..be770c4a7 100644 --- a/src/tool/ToolCom.cpp +++ b/src/tool/ToolCom.cpp @@ -120,8 +120,8 @@ void Socket::data_received() // -Q3PtrList ToolCom::used; -Q3PtrList ToolCom::unused; +QList ToolCom::used; +QList ToolCom::unused; int ToolCom::exitvalue; ToolCom::ToolCom() @@ -167,7 +167,7 @@ int ToolCom::run(const char * cmd, BrowserNode * bn, ToolCom * com = (unused.isEmpty()) ? new ToolCom - : unused.take(0); + : unused.takeFirst(); com->DisconnectExternalProcess(); @@ -213,10 +213,8 @@ int exit_value() bool ToolCom::is_running(int id) { - Q3PtrListIterator it(used); - - for (; it.current(); ++it) - if (it.current()->id == id) + foreach (ToolCom *item, used) + if (item->id == id) return TRUE; return FALSE; @@ -748,17 +746,16 @@ void ToolCom::data_received(Socket * who) break; case allMarkedCmd: { - Q3PtrList marked = BrowserNode::marked_nodes(); + QList 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); } diff --git a/src/tool/ToolCom.h b/src/tool/ToolCom.h index d61ba1ae7..611c7cfb7 100644 --- a/src/tool/ToolCom.h +++ b/src/tool/ToolCom.h @@ -48,8 +48,8 @@ class ToolCom : public QObject Q_OBJECT protected: - static Q3PtrList used; - static Q3PtrList unused; + static QList used; + static QList unused; static int exitvalue; bool start; From c193b1e817d635f72a4b6ea323b28656d974002f Mon Sep 17 00:00:00 2001 From: zeks Date: Wed, 22 May 2013 22:31:57 +0400 Subject: [PATCH 096/297] this should fix quickedit crash --- changelog.txt | 2 ++ src/CustomWidgets/quickedit.cpp | 4 ++-- .../quickeditcontrollersetup.cpp | 5 ++-- src/data/ClassData.cpp | 10 -------- src/data/OperationData.cpp | 24 +++++++++++++++++++ src/data/OperationData.h | 1 + src/ui/catalogwidget.cpp | 8 +++---- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/changelog.txt b/changelog.txt index bbaa46713..9a1434c0c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,5 @@ +v1.0b7.4 + 1.Fixed the crash at editing unidirectional association. v1.0b7.1 1. Fixed the crash that could occur if the user closed quick edit while editing param type 2. Attribute and operations added through quick edit now appear at their proper places in main tree view diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index 9f7432a39..f54d20a48 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -592,8 +592,8 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) 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))); +// connect(ui->tvEditor->header(), SIGNAL(sectionResized(int,int,int)), +// this, SLOT(OnNewSectionSizes(int,int,int))); } void QuickEdit::Show(BrowserNode * node) diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 4d69316dc..43fc72ea9 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -257,8 +257,9 @@ void QuickEdit::SetupOperationController() operationController->SetColumns(columns); ADD_GETSET(BrowserOperation, operationController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET(BrowserOperationReturnType, operationController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), - toString, get_param_type().get_type, set_param_type); + + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + toString, get_return_type().get_type, set_return_type); ADD_GETSET_CONVERTED(BrowserOperation, operationController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_uml_visibility); diff --git a/src/data/ClassData.cpp b/src/data/ClassData.cpp index cc832395a..9401ebc81 100644 --- a/src/data/ClassData.cpp +++ b/src/data/ClassData.cpp @@ -858,18 +858,8 @@ bool ClassData::tool_cmd(ToolCom * com, const char * args, void ClassData::edit() { setName(browser_node->get_name()); - - // edition must be modal - //An factory; ClassDialog::Instance(this)->show(); ClassDialog::Instance(this)->raise(); - //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::id()); - //dialog->show(); - } // diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 688211921..bdc43548a 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -769,6 +769,30 @@ void OperationData::set_return_type(const AType & t) return_type.explicit_type = t.explicit_type; } +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.findIndex(text(index, 0))); + +// oper->set_param_name(index, text(index, 1).stripWhiteSpace()); + + AType t; + if (!value.isEmpty()) + { + int rank = list.findIndex(value); + + if (rank != -1) + t.type = (BrowserClass *) nodes.at(rank); + else + t.explicit_type = value; + } + return_type = t; +} + const char * OperationData::get_param_name(int rank) const { return params[rank]->get_name(); diff --git a/src/data/OperationData.h b/src/data/OperationData.h index 8faae0970..9883859bb 100644 --- a/src/data/OperationData.h +++ b/src/data/OperationData.h @@ -308,6 +308,7 @@ class OperationData : public ClassMemberData, 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; QStringList get_param_names() const; diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp index d08246a04..289375c94 100644 --- a/src/ui/catalogwidget.cpp +++ b/src/ui/catalogwidget.cpp @@ -104,10 +104,10 @@ void CatalogWidget::Init(UmlWindow* window, BrowserView* view) mainWindow, SLOT(OnPickSelectionFromItem( QModelIndex, QModelIndex ))); - dragDropFilter = new GenericEventFilter(this); - std::functionfavsFunc = std::bind(&CatalogWidget::AddToFavourites, this, std::placeholders::_1); - dragDropFilter->SetEventProcessor(std::bind(ProcessDragDrop,std::placeholders::_1, std::placeholders::_2, favsFunc)); - ui->tvFavourites->installEventFilter(dragDropFilter); + //dragDropFilter = new GenericEventFilter(this); + //std::functionfavsFunc = 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); From 052c34f28ff03610c02a947f55c09603b4808f50 Mon Sep 17 00:00:00 2001 From: zeks Date: Wed, 22 May 2013 23:03:20 +0400 Subject: [PATCH 097/297] fixes crash on exit --- src/data/ClassData.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/data/ClassData.cpp b/src/data/ClassData.cpp index c0de60406..cc77a9727 100644 --- a/src/data/ClassData.cpp +++ b/src/data/ClassData.cpp @@ -149,8 +149,10 @@ ClassData::~ClassData() if (formals != 0) delete [] formals; - while (! actuals.isEmpty()) { + while (! actuals.isEmpty()) + { delete actuals.at(0); + actuals[0] = nullptr; actuals.remove(0u); } } From 7f391a671698850774e11fe57532427f12f673a4 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 25 May 2013 00:04:36 +0400 Subject: [PATCH 098/297] class dialog storage system changed a bit --- src/dialog/ClassDialog.cpp | 3 +- src/dialog/ClassDialog.h | 2 +- src/moc_ActivityActionCanvas.cpp | 99 +++ src/moc_ActivityActionData.cpp | 94 ++ src/moc_ActivityActionDialog.cpp | 575 ++++++++++++ src/moc_ActivityCanvas.cpp | 98 +++ src/moc_ActivityData.cpp | 94 ++ src/moc_ActivityDiagramView.cpp | 81 ++ src/moc_ActivityDiagramWindow.cpp | 143 +++ src/moc_ActivityDialog.cpp | 105 +++ src/moc_ActivityNodeCanvas.cpp | 98 +++ src/moc_ActivityObjectCanvas.cpp | 99 +++ src/moc_ActivityObjectData.cpp | 96 ++ src/moc_ActivityObjectDialog.cpp | 110 +++ src/moc_ActivityPartitionCanvas.cpp | 99 +++ src/moc_ActivityPartitionDialog.cpp | 103 +++ src/moc_ActualParamData.cpp | 94 ++ src/moc_AnnotationDialog.cpp | 96 ++ src/moc_ArrowCanvas.cpp | 101 +++ src/moc_ArrowJunctionCanvas.cpp | 99 +++ src/moc_ArtifactCanvas.cpp | 98 +++ src/moc_ArtifactData.cpp | 94 ++ src/moc_ArtifactDialog.cpp | 186 ++++ src/moc_AttributeData.cpp | 97 ++ src/moc_AttributeDialog.cpp | 160 ++++ src/moc_BasicData.cpp | 115 +++ src/moc_BasicDialog.cpp | 99 +++ src/moc_BodyDialog.cpp | 81 ++ src/moc_BrowserSearchDialog.cpp | 107 +++ src/moc_BrowserView.cpp | 146 +++ src/moc_CdClassCanvas.cpp | 100 +++ src/moc_ClassData.cpp | 107 +++ src/moc_ClassDiagramWindow.cpp | 132 +++ src/moc_ClassDialog.cpp | 306 +++++++ src/moc_ClassInstanceData.cpp | 96 ++ src/moc_ClassInstanceDialog.cpp | 179 ++++ src/moc_ClassMemberData.cpp | 81 ++ src/moc_ClassSettingsDialog.cpp | 96 ++ src/moc_ClassViewDialog.cpp | 100 +++ src/moc_ClipboardManager.cpp | 108 +++ src/moc_CodAddMsgDialog.cpp | 99 +++ src/moc_CodChangeMsgDialog.cpp | 99 +++ src/moc_CodClassInstCanvas.cpp | 100 +++ src/moc_CodDirsCanvas.cpp | 100 +++ src/moc_CodSelfLinkCanvas.cpp | 100 +++ src/moc_ColDiagramWindow.cpp | 116 +++ src/moc_ColMsgTable.cpp | 94 ++ src/moc_ComponentCanvas.cpp | 100 +++ src/moc_ComponentDiagramView.cpp | 81 ++ src/moc_ComponentDiagramWindow.cpp | 118 +++ src/moc_ComponentDialog.cpp | 125 +++ src/moc_ConstraintCanvas.cpp | 94 ++ src/moc_ConstraintDialog.cpp | 177 ++++ src/moc_ContinuationDialog.cpp | 96 ++ src/moc_DecoratorDialog.cpp | 96 ++ src/moc_DeploymentDiagramView.cpp | 81 ++ src/moc_DeploymentDiagramWindow.cpp | 126 +++ src/moc_DeploymentNodeCanvas.cpp | 101 +++ src/moc_DiagramView.cpp | 104 +++ src/moc_DiagramWindow.cpp | 105 +++ src/moc_DialogTimer.cpp | 94 ++ src/moc_EdgeMenuDialog.cpp | 147 ++++ src/moc_EdgeMenuFactory.cpp | 94 ++ src/moc_EdgeMenuToolBar.cpp | 135 +++ src/moc_EnvDialog.cpp | 108 +++ src/moc_ExpansionNodeCanvas.cpp | 99 +++ src/moc_ExpansionRegionCanvas.cpp | 99 +++ src/moc_ExpansionRegionDialog.cpp | 101 +++ src/moc_ExtraMemberData.cpp | 81 ++ src/moc_ExtraMemberDialog.cpp | 114 +++ src/moc_FlowCanvas.cpp | 96 ++ src/moc_FlowData.cpp | 94 ++ src/moc_FlowDialog.cpp | 123 +++ src/moc_FormalParamData.cpp | 97 ++ src/moc_FragmentCanvas.cpp | 96 ++ src/moc_FragmentDialog.cpp | 99 +++ src/moc_GenerationSettingsBuiltinTable.cpp | 111 +++ src/moc_GenerationSettingsDialog.cpp | 160 ++++ src/moc_GreetingsDialog.cpp | 96 ++ src/moc_HelpDialog.cpp | 81 ++ src/moc_HelpRegexpDialog.cpp | 81 ++ src/moc_HideShowDialog.cpp | 111 +++ src/moc_IconCanvas.cpp | 96 ++ src/moc_ImageDialog.cpp | 101 +++ src/moc_InstanceDialog.cpp | 99 +++ src/moc_InterruptibleActivityRegionCanvas.cpp | 99 +++ src/moc_MLEDialog.cpp | 81 ++ src/moc_MultiPurposeDragArea.cpp | 146 +++ src/moc_MyInputDialog.cpp | 96 ++ src/moc_MyTable.cpp | 81 ++ src/moc_NoteCanvas.cpp | 96 ++ src/moc_ObjectDiagramWindow.cpp | 113 +++ src/moc_ObjectLinkCanvas.cpp | 96 ++ src/moc_ObjectLinkDialog.cpp | 101 +++ src/moc_OdClassInstCanvas.cpp | 100 +++ src/moc_OperationData.cpp | 98 +++ src/moc_OperationDialog.cpp | 832 ++++++++++++++++++ src/moc_PackageCanvas.cpp | 98 +++ src/moc_PackageDialog.cpp | 132 +++ src/moc_ParameterCanvas.cpp | 98 +++ src/moc_ParameterData.cpp | 96 ++ src/moc_ParameterDialog.cpp | 113 +++ src/moc_ParameterSetCanvas.cpp | 101 +++ src/moc_ParameterSetData.cpp | 94 ++ src/moc_ParameterSetDialog.cpp | 105 +++ src/moc_PinCanvas.cpp | 98 +++ src/moc_PinDialog.cpp | 110 +++ src/moc_PseudoStateCanvas.cpp | 98 +++ src/moc_PseudoStateData.cpp | 94 ++ src/moc_PseudoStateDialog.cpp | 101 +++ src/moc_ReferenceDialog.cpp | 107 +++ src/moc_RelatedElementsDialog.cpp | 97 ++ src/moc_RelationCanvas.cpp | 102 +++ src/moc_RelationData.cpp | 98 +++ src/moc_RelationDialog.cpp | 210 +++++ src/moc_RevSettingsDialog.cpp | 99 +++ src/moc_SdClassInstCanvas.cpp | 100 +++ src/moc_SdContinuationCanvas.cpp | 96 ++ src/moc_SdDurationCanvas.cpp | 98 +++ src/moc_SdMsgBaseCanvas.cpp | 96 ++ src/moc_SdMsgDialog.cpp | 99 +++ src/moc_SeqDiagramWindow.cpp | 136 +++ src/moc_Settings.cpp | 100 +++ src/moc_SettingsDialog.cpp | 99 +++ src/moc_ShortcutDialog.cpp | 173 ++++ src/moc_SimpleData.cpp | 81 ++ src/moc_SimpleRelationCanvas.cpp | 97 ++ src/moc_SimpleRelationData.cpp | 94 ++ src/moc_SimpleRelationDialog.cpp | 99 +++ src/moc_Socket.cpp | 94 ++ src/moc_SourceDialog.cpp | 177 ++++ src/moc_StateActionCanvas.cpp | 98 +++ src/moc_StateActionDialog.cpp | 100 +++ src/moc_StateCanvas.cpp | 100 +++ src/moc_StateData.cpp | 94 ++ src/moc_StateDiagramView.cpp | 81 ++ src/moc_StateDiagramWindow.cpp | 147 ++++ src/moc_StateDialog.cpp | 130 +++ src/moc_StereotypeDialog.cpp | 96 ++ src/moc_StereotypePropertiesCanvas.cpp | 94 ++ src/moc_StereotypesDialog.cpp | 96 ++ src/moc_StringTable.cpp | 97 ++ src/moc_SubjectCanvas.cpp | 96 ++ src/moc_ToolCom.cpp | 107 +++ src/moc_ToolDialog.cpp | 170 ++++ src/moc_TraceDialog.cpp | 96 ++ src/moc_TransitionCanvas.cpp | 96 ++ src/moc_TransitionData.cpp | 94 ++ src/moc_TransitionDialog.cpp | 123 +++ src/moc_UcClassCanvas.cpp | 98 +++ src/moc_UcUseCaseCanvas.cpp | 98 +++ src/moc_UmlCanvas.cpp | 94 ++ src/moc_UmlWindow.cpp | 295 +++++++ src/moc_UseCaseData.cpp | 81 ++ src/moc_UseCaseDiagramView.cpp | 81 ++ src/moc_UseCaseDiagramWindow.cpp | 124 +++ src/moc_UseCaseDialog.cpp | 99 +++ src/moc_catalogwidget.cpp | 146 +++ src/moc_constructorinitializerdialog.cpp | 95 ++ src/moc_edgemenudialogqt4.cpp | 144 +++ src/moc_operationwidgetcpp.cpp | 81 ++ src/moc_quickedit.cpp | 126 +++ 162 files changed, 18606 insertions(+), 2 deletions(-) create mode 100644 src/moc_ActivityActionCanvas.cpp create mode 100644 src/moc_ActivityActionData.cpp create mode 100644 src/moc_ActivityActionDialog.cpp create mode 100644 src/moc_ActivityCanvas.cpp create mode 100644 src/moc_ActivityData.cpp create mode 100644 src/moc_ActivityDiagramView.cpp create mode 100644 src/moc_ActivityDiagramWindow.cpp create mode 100644 src/moc_ActivityDialog.cpp create mode 100644 src/moc_ActivityNodeCanvas.cpp create mode 100644 src/moc_ActivityObjectCanvas.cpp create mode 100644 src/moc_ActivityObjectData.cpp create mode 100644 src/moc_ActivityObjectDialog.cpp create mode 100644 src/moc_ActivityPartitionCanvas.cpp create mode 100644 src/moc_ActivityPartitionDialog.cpp create mode 100644 src/moc_ActualParamData.cpp create mode 100644 src/moc_AnnotationDialog.cpp create mode 100644 src/moc_ArrowCanvas.cpp create mode 100644 src/moc_ArrowJunctionCanvas.cpp create mode 100644 src/moc_ArtifactCanvas.cpp create mode 100644 src/moc_ArtifactData.cpp create mode 100644 src/moc_ArtifactDialog.cpp create mode 100644 src/moc_AttributeData.cpp create mode 100644 src/moc_AttributeDialog.cpp create mode 100644 src/moc_BasicData.cpp create mode 100644 src/moc_BasicDialog.cpp create mode 100644 src/moc_BodyDialog.cpp create mode 100644 src/moc_BrowserSearchDialog.cpp create mode 100644 src/moc_BrowserView.cpp create mode 100644 src/moc_CdClassCanvas.cpp create mode 100644 src/moc_ClassData.cpp create mode 100644 src/moc_ClassDiagramWindow.cpp create mode 100644 src/moc_ClassDialog.cpp create mode 100644 src/moc_ClassInstanceData.cpp create mode 100644 src/moc_ClassInstanceDialog.cpp create mode 100644 src/moc_ClassMemberData.cpp create mode 100644 src/moc_ClassSettingsDialog.cpp create mode 100644 src/moc_ClassViewDialog.cpp create mode 100644 src/moc_ClipboardManager.cpp create mode 100644 src/moc_CodAddMsgDialog.cpp create mode 100644 src/moc_CodChangeMsgDialog.cpp create mode 100644 src/moc_CodClassInstCanvas.cpp create mode 100644 src/moc_CodDirsCanvas.cpp create mode 100644 src/moc_CodSelfLinkCanvas.cpp create mode 100644 src/moc_ColDiagramWindow.cpp create mode 100644 src/moc_ColMsgTable.cpp create mode 100644 src/moc_ComponentCanvas.cpp create mode 100644 src/moc_ComponentDiagramView.cpp create mode 100644 src/moc_ComponentDiagramWindow.cpp create mode 100644 src/moc_ComponentDialog.cpp create mode 100644 src/moc_ConstraintCanvas.cpp create mode 100644 src/moc_ConstraintDialog.cpp create mode 100644 src/moc_ContinuationDialog.cpp create mode 100644 src/moc_DecoratorDialog.cpp create mode 100644 src/moc_DeploymentDiagramView.cpp create mode 100644 src/moc_DeploymentDiagramWindow.cpp create mode 100644 src/moc_DeploymentNodeCanvas.cpp create mode 100644 src/moc_DiagramView.cpp create mode 100644 src/moc_DiagramWindow.cpp create mode 100644 src/moc_DialogTimer.cpp create mode 100644 src/moc_EdgeMenuDialog.cpp create mode 100644 src/moc_EdgeMenuFactory.cpp create mode 100644 src/moc_EdgeMenuToolBar.cpp create mode 100644 src/moc_EnvDialog.cpp create mode 100644 src/moc_ExpansionNodeCanvas.cpp create mode 100644 src/moc_ExpansionRegionCanvas.cpp create mode 100644 src/moc_ExpansionRegionDialog.cpp create mode 100644 src/moc_ExtraMemberData.cpp create mode 100644 src/moc_ExtraMemberDialog.cpp create mode 100644 src/moc_FlowCanvas.cpp create mode 100644 src/moc_FlowData.cpp create mode 100644 src/moc_FlowDialog.cpp create mode 100644 src/moc_FormalParamData.cpp create mode 100644 src/moc_FragmentCanvas.cpp create mode 100644 src/moc_FragmentDialog.cpp create mode 100644 src/moc_GenerationSettingsBuiltinTable.cpp create mode 100644 src/moc_GenerationSettingsDialog.cpp create mode 100644 src/moc_GreetingsDialog.cpp create mode 100644 src/moc_HelpDialog.cpp create mode 100644 src/moc_HelpRegexpDialog.cpp create mode 100644 src/moc_HideShowDialog.cpp create mode 100644 src/moc_IconCanvas.cpp create mode 100644 src/moc_ImageDialog.cpp create mode 100644 src/moc_InstanceDialog.cpp create mode 100644 src/moc_InterruptibleActivityRegionCanvas.cpp create mode 100644 src/moc_MLEDialog.cpp create mode 100644 src/moc_MultiPurposeDragArea.cpp create mode 100644 src/moc_MyInputDialog.cpp create mode 100644 src/moc_MyTable.cpp create mode 100644 src/moc_NoteCanvas.cpp create mode 100644 src/moc_ObjectDiagramWindow.cpp create mode 100644 src/moc_ObjectLinkCanvas.cpp create mode 100644 src/moc_ObjectLinkDialog.cpp create mode 100644 src/moc_OdClassInstCanvas.cpp create mode 100644 src/moc_OperationData.cpp create mode 100644 src/moc_OperationDialog.cpp create mode 100644 src/moc_PackageCanvas.cpp create mode 100644 src/moc_PackageDialog.cpp create mode 100644 src/moc_ParameterCanvas.cpp create mode 100644 src/moc_ParameterData.cpp create mode 100644 src/moc_ParameterDialog.cpp create mode 100644 src/moc_ParameterSetCanvas.cpp create mode 100644 src/moc_ParameterSetData.cpp create mode 100644 src/moc_ParameterSetDialog.cpp create mode 100644 src/moc_PinCanvas.cpp create mode 100644 src/moc_PinDialog.cpp create mode 100644 src/moc_PseudoStateCanvas.cpp create mode 100644 src/moc_PseudoStateData.cpp create mode 100644 src/moc_PseudoStateDialog.cpp create mode 100644 src/moc_ReferenceDialog.cpp create mode 100644 src/moc_RelatedElementsDialog.cpp create mode 100644 src/moc_RelationCanvas.cpp create mode 100644 src/moc_RelationData.cpp create mode 100644 src/moc_RelationDialog.cpp create mode 100644 src/moc_RevSettingsDialog.cpp create mode 100644 src/moc_SdClassInstCanvas.cpp create mode 100644 src/moc_SdContinuationCanvas.cpp create mode 100644 src/moc_SdDurationCanvas.cpp create mode 100644 src/moc_SdMsgBaseCanvas.cpp create mode 100644 src/moc_SdMsgDialog.cpp create mode 100644 src/moc_SeqDiagramWindow.cpp create mode 100644 src/moc_Settings.cpp create mode 100644 src/moc_SettingsDialog.cpp create mode 100644 src/moc_ShortcutDialog.cpp create mode 100644 src/moc_SimpleData.cpp create mode 100644 src/moc_SimpleRelationCanvas.cpp create mode 100644 src/moc_SimpleRelationData.cpp create mode 100644 src/moc_SimpleRelationDialog.cpp create mode 100644 src/moc_Socket.cpp create mode 100644 src/moc_SourceDialog.cpp create mode 100644 src/moc_StateActionCanvas.cpp create mode 100644 src/moc_StateActionDialog.cpp create mode 100644 src/moc_StateCanvas.cpp create mode 100644 src/moc_StateData.cpp create mode 100644 src/moc_StateDiagramView.cpp create mode 100644 src/moc_StateDiagramWindow.cpp create mode 100644 src/moc_StateDialog.cpp create mode 100644 src/moc_StereotypeDialog.cpp create mode 100644 src/moc_StereotypePropertiesCanvas.cpp create mode 100644 src/moc_StereotypesDialog.cpp create mode 100644 src/moc_StringTable.cpp create mode 100644 src/moc_SubjectCanvas.cpp create mode 100644 src/moc_ToolCom.cpp create mode 100644 src/moc_ToolDialog.cpp create mode 100644 src/moc_TraceDialog.cpp create mode 100644 src/moc_TransitionCanvas.cpp create mode 100644 src/moc_TransitionData.cpp create mode 100644 src/moc_TransitionDialog.cpp create mode 100644 src/moc_UcClassCanvas.cpp create mode 100644 src/moc_UcUseCaseCanvas.cpp create mode 100644 src/moc_UmlCanvas.cpp create mode 100644 src/moc_UmlWindow.cpp create mode 100644 src/moc_UseCaseData.cpp create mode 100644 src/moc_UseCaseDiagramView.cpp create mode 100644 src/moc_UseCaseDiagramWindow.cpp create mode 100644 src/moc_UseCaseDialog.cpp create mode 100644 src/moc_catalogwidget.cpp create mode 100644 src/moc_constructorinitializerdialog.cpp create mode 100644 src/moc_edgemenudialogqt4.cpp create mode 100644 src/moc_operationwidgetcpp.cpp create mode 100644 src/moc_quickedit.cpp diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp index 0811023c6..2f49e13da 100644 --- a/src/dialog/ClassDialog.cpp +++ b/src/dialog/ClassDialog.cpp @@ -78,7 +78,7 @@ QSize ClassDialog::previous_size; static QString RelativeRoot; static QString RelativePrj; static QString Absolute; -QSharedPointer ClassDialog::instance; +//QSharedPointer ClassDialog::instance; ClassDialog::ClassDialog(ClassData * c): EdgeMenuDialog(0, 0, FALSE), cl(c) { // take time in case of many classes and artifacts @@ -114,6 +114,7 @@ ClassDialog::~ClassDialog() QSharedPointer ClassDialog::Instance(ClassData * cl) { + static QSharedPointer instance; if (instance.isNull()) instance = QSharedPointer(new ClassDialog(cl)); else diff --git a/src/dialog/ClassDialog.h b/src/dialog/ClassDialog.h index 29fb24ec2..67dfe1747 100644 --- a/src/dialog/ClassDialog.h +++ b/src/dialog/ClassDialog.h @@ -225,7 +225,7 @@ class ClassDialog : public EdgeMenuDialog //refactoring changes - static QSharedPointer instance; + //static QSharedPointer instance; public: diff --git a/src/moc_ActivityActionCanvas.cpp b/src/moc_ActivityActionCanvas.cpp new file mode 100644 index 000000000..382424d90 --- /dev/null +++ b/src/moc_ActivityActionCanvas.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityActionCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ActivityActionCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityActionCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityActionCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x08, + 33, 21, 21, 21, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityActionCanvas[] = { + "ActivityActionCanvas\0\0modified()\0" + "deleted()\0" +}; + +void ActivityActionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityActionCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityActionCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityActionCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ActivityActionCanvas, + qt_meta_data_ActivityActionCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityActionCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityActionCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityActionCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityActionCanvas)) + return static_cast(const_cast< ActivityActionCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ActivityActionCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ActivityActionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityActionData.cpp b/src/moc_ActivityActionData.cpp new file mode 100644 index 000000000..e339e1fed --- /dev/null +++ b/src/moc_ActivityActionData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityActionData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ActivityActionData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityActionData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityActionData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityActionData[] = { + "ActivityActionData\0\0depend_deleted()\0" +}; + +void ActivityActionData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityActionData *_t = static_cast(_o); + switch (_id) { + case 0: _t->depend_deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityActionData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityActionData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_ActivityActionData, + qt_meta_data_ActivityActionData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityActionData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityActionData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityActionData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityActionData)) + return static_cast(const_cast< ActivityActionData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int ActivityActionData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityActionDialog.cpp b/src/moc_ActivityActionDialog.cpp new file mode 100644 index 000000000..bc7223640 --- /dev/null +++ b/src/moc_ActivityActionDialog.cpp @@ -0,0 +1,575 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityActionDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ActivityActionDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityActionDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_OpaqueDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x09, + 25, 13, 13, 13, 0x09, + 36, 13, 13, 13, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_OpaqueDialog[] = { + "OpaqueDialog\0\0edit_ocl()\0edit_cpp()\0" + "edit_java()\0" +}; + +void OpaqueDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + OpaqueDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->edit_ocl(); break; + case 1: _t->edit_cpp(); break; + case 2: _t->edit_java(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData OpaqueDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject OpaqueDialog::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_OpaqueDialog, + qt_meta_data_OpaqueDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &OpaqueDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *OpaqueDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *OpaqueDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_OpaqueDialog)) + return static_cast(const_cast< OpaqueDialog*>(this)); + if (!strcmp(_clname, "AnyActionDialog")) + return static_cast< AnyActionDialog*>(const_cast< OpaqueDialog*>(this)); + return QObject::qt_metacast(_clname); +} + +int OpaqueDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +static const uint qt_meta_data_AccessVariableValueDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 27, 26, 26, 26, 0x09, + 45, 26, 26, 26, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_AccessVariableValueDialog[] = { + "AccessVariableValueDialog\0\0classChanged(int)\0" + "menu_var()\0" +}; + +void AccessVariableValueDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + AccessVariableValueDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->classChanged((*reinterpret_cast< int(*)>(_a[1]))); break; + case 1: _t->menu_var(); break; + default: ; + } + } +} + +const QMetaObjectExtraData AccessVariableValueDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject AccessVariableValueDialog::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_AccessVariableValueDialog, + qt_meta_data_AccessVariableValueDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &AccessVariableValueDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *AccessVariableValueDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *AccessVariableValueDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_AccessVariableValueDialog)) + return static_cast(const_cast< AccessVariableValueDialog*>(this)); + if (!strcmp(_clname, "AnyActionDialog")) + return static_cast< AnyActionDialog*>(const_cast< AccessVariableValueDialog*>(this)); + return QObject::qt_metacast(_clname); +} + +int AccessVariableValueDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_CallBehaviorDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_CallBehaviorDialog[] = { + "CallBehaviorDialog\0\0menu_beh()\0" +}; + +void CallBehaviorDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CallBehaviorDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->menu_beh(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CallBehaviorDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CallBehaviorDialog::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_CallBehaviorDialog, + qt_meta_data_CallBehaviorDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CallBehaviorDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CallBehaviorDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CallBehaviorDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CallBehaviorDialog)) + return static_cast(const_cast< CallBehaviorDialog*>(this)); + if (!strcmp(_clname, "WithBehaviorDialog")) + return static_cast< WithBehaviorDialog*>(const_cast< CallBehaviorDialog*>(this)); + return QObject::qt_metacast(_clname); +} + +int CallBehaviorDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +static const uint qt_meta_data_CallOperationDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 21, 20, 20, 20, 0x09, + 39, 20, 20, 20, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_CallOperationDialog[] = { + "CallOperationDialog\0\0classChanged(int)\0" + "menu_oper()\0" +}; + +void CallOperationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CallOperationDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->classChanged((*reinterpret_cast< int(*)>(_a[1]))); break; + case 1: _t->menu_oper(); break; + default: ; + } + } +} + +const QMetaObjectExtraData CallOperationDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CallOperationDialog::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_CallOperationDialog, + qt_meta_data_CallOperationDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CallOperationDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CallOperationDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CallOperationDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CallOperationDialog)) + return static_cast(const_cast< CallOperationDialog*>(this)); + if (!strcmp(_clname, "AnyActionDialog")) + return static_cast< AnyActionDialog*>(const_cast< CallOperationDialog*>(this)); + return QObject::qt_metacast(_clname); +} + +int CallOperationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_ValueSpecificationDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 26, 25, 25, 25, 0x09, + 37, 25, 25, 25, 0x09, + 48, 25, 25, 25, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ValueSpecificationDialog[] = { + "ValueSpecificationDialog\0\0edit_ocl()\0" + "edit_cpp()\0edit_java()\0" +}; + +void ValueSpecificationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ValueSpecificationDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->edit_ocl(); break; + case 1: _t->edit_cpp(); break; + case 2: _t->edit_java(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ValueSpecificationDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ValueSpecificationDialog::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ValueSpecificationDialog, + qt_meta_data_ValueSpecificationDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ValueSpecificationDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ValueSpecificationDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ValueSpecificationDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ValueSpecificationDialog)) + return static_cast(const_cast< ValueSpecificationDialog*>(this)); + if (!strcmp(_clname, "AnyActionDialog")) + return static_cast< AnyActionDialog*>(const_cast< ValueSpecificationDialog*>(this)); + return QObject::qt_metacast(_clname); +} + +int ValueSpecificationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +static const uint qt_meta_data_ReduceDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_ReduceDialog[] = { + "ReduceDialog\0\0menu_beh()\0" +}; + +void ReduceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ReduceDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->menu_beh(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ReduceDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ReduceDialog::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ReduceDialog, + qt_meta_data_ReduceDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ReduceDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ReduceDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ReduceDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ReduceDialog)) + return static_cast(const_cast< ReduceDialog*>(this)); + if (!strcmp(_clname, "WithBehaviorDialog")) + return static_cast< WithBehaviorDialog*>(const_cast< ReduceDialog*>(this)); + return QObject::qt_metacast(_clname); +} + +int ReduceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +static const uint qt_meta_data_ActivityActionDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 6, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x09, + 31, 21, 21, 21, 0x09, + 40, 21, 21, 21, 0x09, + 61, 21, 21, 21, 0x09, + 80, 21, 21, 21, 0x09, + 98, 21, 21, 21, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityActionDialog[] = { + "ActivityActionDialog\0\0polish()\0accept()\0" + "edTypeActivated(int)\0edit_description()\0" + "edit_constraint()\0change_tabs(QWidget*)\0" +}; + +void ActivityActionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityActionDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edTypeActivated((*reinterpret_cast< int(*)>(_a[1]))); break; + case 3: _t->edit_description(); break; + case 4: _t->edit_constraint(); break; + case 5: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ActivityActionDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityActionDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityActionDialog, + qt_meta_data_ActivityActionDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityActionDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityActionDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityActionDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityActionDialog)) + return static_cast(const_cast< ActivityActionDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ActivityActionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 6) + qt_static_metacall(this, _c, _id, _a); + _id -= 6; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityCanvas.cpp b/src/moc_ActivityCanvas.cpp new file mode 100644 index 000000000..a2a21b720 --- /dev/null +++ b/src/moc_ActivityCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ActivityCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x08, + 27, 15, 15, 15, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityCanvas[] = { + "ActivityCanvas\0\0modified()\0deleted()\0" +}; + +void ActivityCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ActivityCanvas, + qt_meta_data_ActivityCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityCanvas)) + return static_cast(const_cast< ActivityCanvas*>(this)); + if (!strcmp(_clname, "ActivityContainerCanvas")) + return static_cast< ActivityContainerCanvas*>(const_cast< ActivityCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ActivityCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityData.cpp b/src/moc_ActivityData.cpp new file mode 100644 index 000000000..b35993e8e --- /dev/null +++ b/src/moc_ActivityData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ActivityData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityData[] = { + "ActivityData\0\0on_delete()\0" +}; + +void ActivityData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_ActivityData, + qt_meta_data_ActivityData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityData)) + return static_cast(const_cast< ActivityData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int ActivityData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityDiagramView.cpp b/src/moc_ActivityDiagramView.cpp new file mode 100644 index 000000000..1d98a7b1f --- /dev/null +++ b/src/moc_ActivityDiagramView.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityDiagramView.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ActivityDiagramView.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityDiagramView.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityDiagramView[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityDiagramView[] = { + "ActivityDiagramView\0" +}; + +void ActivityDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityDiagramView::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityDiagramView::staticMetaObject = { + { &DiagramView::staticMetaObject, qt_meta_stringdata_ActivityDiagramView, + qt_meta_data_ActivityDiagramView, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityDiagramView::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityDiagramView::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityDiagramView::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityDiagramView)) + return static_cast(const_cast< ActivityDiagramView*>(this)); + return DiagramView::qt_metacast(_clname); +} + +int ActivityDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramView::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityDiagramWindow.cpp b/src/moc_ActivityDiagramWindow.cpp new file mode 100644 index 000000000..34ad58ec7 --- /dev/null +++ b/src/moc_ActivityDiagramWindow.cpp @@ -0,0 +1,143 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ActivityDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 21, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 23, 22, 22, 22, 0x09, + 38, 22, 22, 22, 0x09, + 72, 22, 22, 22, 0x09, + 94, 22, 22, 22, 0x09, + 118, 22, 22, 22, 0x09, + 132, 22, 22, 22, 0x09, + 152, 22, 22, 22, 0x09, + 168, 22, 22, 22, 0x09, + 183, 22, 22, 22, 0x09, + 195, 22, 22, 22, 0x09, + 206, 22, 22, 22, 0x09, + 217, 22, 22, 22, 0x09, + 230, 22, 22, 22, 0x09, + 243, 22, 22, 22, 0x09, + 254, 22, 22, 22, 0x09, + 271, 22, 22, 22, 0x09, + 285, 22, 22, 22, 0x09, + 300, 22, 22, 22, 0x09, + 311, 22, 22, 22, 0x09, + 324, 22, 22, 22, 0x09, + 335, 22, 22, 22, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityDiagramWindow[] = { + "ActivityDiagramWindow\0\0hit_activity()\0" + "hit_interruptibleactivityregion()\0" + "hit_expansionregion()\0hit_activitypartition()\0" + "hit_initial()\0hit_activityfinal()\0" + "hit_flowfinal()\0hit_decision()\0" + "hit_merge()\0hit_fork()\0hit_join()\0" + "hit_action()\0hit_object()\0hit_flow()\0" + "hit_dependency()\0hit_package()\0" + "hit_fragment()\0hit_note()\0hit_anchor()\0" + "hit_text()\0hit_image()\0" +}; + +void ActivityDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_activity(); break; + case 1: _t->hit_interruptibleactivityregion(); break; + case 2: _t->hit_expansionregion(); break; + case 3: _t->hit_activitypartition(); break; + case 4: _t->hit_initial(); break; + case 5: _t->hit_activityfinal(); break; + case 6: _t->hit_flowfinal(); break; + case 7: _t->hit_decision(); break; + case 8: _t->hit_merge(); break; + case 9: _t->hit_fork(); break; + case 10: _t->hit_join(); break; + case 11: _t->hit_action(); break; + case 12: _t->hit_object(); break; + case 13: _t->hit_flow(); break; + case 14: _t->hit_dependency(); break; + case 15: _t->hit_package(); break; + case 16: _t->hit_fragment(); break; + case 17: _t->hit_note(); break; + case 18: _t->hit_anchor(); break; + case 19: _t->hit_text(); break; + case 20: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ActivityDiagramWindow, + qt_meta_data_ActivityDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityDiagramWindow)) + return static_cast(const_cast< ActivityDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int ActivityDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 21) + qt_static_metacall(this, _c, _id, _a); + _id -= 21; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityDialog.cpp b/src/moc_ActivityDialog.cpp new file mode 100644 index 000000000..e8259bb26 --- /dev/null +++ b/src/moc_ActivityDialog.cpp @@ -0,0 +1,105 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ActivityDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 6, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 25, 15, 15, 15, 0x09, + 34, 15, 15, 15, 0x09, + 55, 15, 15, 15, 0x09, + 74, 15, 15, 15, 0x09, + 92, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityDialog[] = { + "ActivityDialog\0\0polish()\0accept()\0" + "menu_specification()\0edit_description()\0" + "edit_constraint()\0change_tabs(QWidget*)\0" +}; + +void ActivityDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->menu_specification(); break; + case 3: _t->edit_description(); break; + case 4: _t->edit_constraint(); break; + case 5: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ActivityDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityDialog, + qt_meta_data_ActivityDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityDialog)) + return static_cast(const_cast< ActivityDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ActivityDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 6) + qt_static_metacall(this, _c, _id, _a); + _id -= 6; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityNodeCanvas.cpp b/src/moc_ActivityNodeCanvas.cpp new file mode 100644 index 000000000..c611a8741 --- /dev/null +++ b/src/moc_ActivityNodeCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityNodeCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ActivityNodeCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityNodeCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityNodeCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x08, + 31, 19, 19, 19, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityNodeCanvas[] = { + "ActivityNodeCanvas\0\0modified()\0deleted()\0" +}; + +void ActivityNodeCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityNodeCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityNodeCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityNodeCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ActivityNodeCanvas, + qt_meta_data_ActivityNodeCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityNodeCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityNodeCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityNodeCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityNodeCanvas)) + return static_cast(const_cast< ActivityNodeCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ActivityNodeCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ActivityNodeCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityObjectCanvas.cpp b/src/moc_ActivityObjectCanvas.cpp new file mode 100644 index 000000000..889e7068e --- /dev/null +++ b/src/moc_ActivityObjectCanvas.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityObjectCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ActivityObjectCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityObjectCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityObjectCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x08, + 33, 21, 21, 21, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityObjectCanvas[] = { + "ActivityObjectCanvas\0\0modified()\0" + "deleted()\0" +}; + +void ActivityObjectCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityObjectCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityObjectCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityObjectCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ActivityObjectCanvas, + qt_meta_data_ActivityObjectCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityObjectCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityObjectCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityObjectCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityObjectCanvas)) + return static_cast(const_cast< ActivityObjectCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ActivityObjectCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ActivityObjectCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityObjectData.cpp b/src/moc_ActivityObjectData.cpp new file mode 100644 index 000000000..ab153bc69 --- /dev/null +++ b/src/moc_ActivityObjectData.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityObjectData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ActivityObjectData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityObjectData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityObjectData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityObjectData[] = { + "ActivityObjectData\0\0on_delete()\0" +}; + +void ActivityObjectData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityObjectData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityObjectData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityObjectData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_ActivityObjectData, + qt_meta_data_ActivityObjectData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityObjectData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityObjectData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityObjectData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityObjectData)) + return static_cast(const_cast< ActivityObjectData*>(this)); + if (!strcmp(_clname, "ObjectData")) + return static_cast< ObjectData*>(const_cast< ActivityObjectData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int ActivityObjectData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityObjectDialog.cpp b/src/moc_ActivityObjectDialog.cpp new file mode 100644 index 000000000..e18724317 --- /dev/null +++ b/src/moc_ActivityObjectDialog.cpp @@ -0,0 +1,110 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityObjectDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ActivityObjectDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityObjectDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityObjectDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 8, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x09, + 31, 21, 21, 21, 0x09, + 40, 21, 21, 21, 0x09, + 59, 21, 21, 21, 0x09, + 80, 21, 21, 21, 0x09, + 101, 21, 21, 21, 0x09, + 123, 21, 21, 21, 0x09, + 135, 21, 21, 21, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityObjectDialog[] = { + "ActivityObjectDialog\0\0polish()\0accept()\0" + "edit_description()\0edit_uml_selection()\0" + "edit_cpp_selection()\0edit_java_selection()\0" + "menu_type()\0change_tabs(QWidget*)\0" +}; + +void ActivityObjectDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityObjectDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->edit_uml_selection(); break; + case 4: _t->edit_cpp_selection(); break; + case 5: _t->edit_java_selection(); break; + case 6: _t->menu_type(); break; + case 7: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ActivityObjectDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityObjectDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityObjectDialog, + qt_meta_data_ActivityObjectDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityObjectDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityObjectDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityObjectDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityObjectDialog)) + return static_cast(const_cast< ActivityObjectDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ActivityObjectDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 8) + qt_static_metacall(this, _c, _id, _a); + _id -= 8; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityPartitionCanvas.cpp b/src/moc_ActivityPartitionCanvas.cpp new file mode 100644 index 000000000..1fc2a482b --- /dev/null +++ b/src/moc_ActivityPartitionCanvas.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityPartitionCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ActivityPartitionCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityPartitionCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityPartitionCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 25, 24, 24, 24, 0x08, + 36, 24, 24, 24, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityPartitionCanvas[] = { + "ActivityPartitionCanvas\0\0modified()\0" + "deleted()\0" +}; + +void ActivityPartitionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityPartitionCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActivityPartitionCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityPartitionCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ActivityPartitionCanvas, + qt_meta_data_ActivityPartitionCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityPartitionCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityPartitionCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityPartitionCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityPartitionCanvas)) + return static_cast(const_cast< ActivityPartitionCanvas*>(this)); + if (!strcmp(_clname, "ActivityContainerCanvas")) + return static_cast< ActivityContainerCanvas*>(const_cast< ActivityPartitionCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ActivityPartitionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityPartitionDialog.cpp b/src/moc_ActivityPartitionDialog.cpp new file mode 100644 index 000000000..bcec8ebf0 --- /dev/null +++ b/src/moc_ActivityPartitionDialog.cpp @@ -0,0 +1,103 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActivityPartitionDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ActivityPartitionDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActivityPartitionDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActivityPartitionDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 5, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 25, 24, 24, 24, 0x09, + 34, 24, 24, 24, 0x09, + 43, 24, 24, 24, 0x09, + 62, 24, 24, 24, 0x09, + 80, 24, 24, 24, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActivityPartitionDialog[] = { + "ActivityPartitionDialog\0\0polish()\0" + "accept()\0edit_description()\0" + "menu_represents()\0change_tabs(QWidget*)\0" +}; + +void ActivityPartitionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActivityPartitionDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->menu_represents(); break; + case 4: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ActivityPartitionDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActivityPartitionDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityPartitionDialog, + qt_meta_data_ActivityPartitionDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActivityPartitionDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActivityPartitionDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActivityPartitionDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActivityPartitionDialog)) + return static_cast(const_cast< ActivityPartitionDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ActivityPartitionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 5) + qt_static_metacall(this, _c, _id, _a); + _id -= 5; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ActualParamData.cpp b/src/moc_ActualParamData.cpp new file mode 100644 index 000000000..fd2e50a72 --- /dev/null +++ b/src/moc_ActualParamData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ActualParamData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ActualParamData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ActualParamData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ActualParamData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ActualParamData[] = { + "ActualParamData\0\0on_delete()\0" +}; + +void ActualParamData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ActualParamData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ActualParamData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ActualParamData::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ActualParamData, + qt_meta_data_ActualParamData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ActualParamData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ActualParamData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ActualParamData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ActualParamData)) + return static_cast(const_cast< ActualParamData*>(this)); + return QObject::qt_metacast(_clname); +} + +int ActualParamData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_AnnotationDialog.cpp b/src/moc_AnnotationDialog.cpp new file mode 100644 index 000000000..3a171e162 --- /dev/null +++ b/src/moc_AnnotationDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'AnnotationDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/AnnotationDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'AnnotationDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_AnnotationDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + 27, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_AnnotationDialog[] = { + "AnnotationDialog\0\0accept()\0add_annotation()\0" +}; + +void AnnotationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + AnnotationDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->accept(); break; + case 1: _t->add_annotation(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData AnnotationDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject AnnotationDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_AnnotationDialog, + qt_meta_data_AnnotationDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &AnnotationDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *AnnotationDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *AnnotationDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_AnnotationDialog)) + return static_cast(const_cast< AnnotationDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int AnnotationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ArrowCanvas.cpp b/src/moc_ArrowCanvas.cpp new file mode 100644 index 000000000..2995956c0 --- /dev/null +++ b/src/moc_ArrowCanvas.cpp @@ -0,0 +1,101 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ArrowCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ArrowCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ArrowCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ArrowCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x09, + 24, 12, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ArrowCanvas[] = { + "ArrowCanvas\0\0modified()\0" + "drawing_settings_modified()\0" +}; + +void ArrowCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ArrowCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->drawing_settings_modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ArrowCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ArrowCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ArrowCanvas, + qt_meta_data_ArrowCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ArrowCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ArrowCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ArrowCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ArrowCanvas)) + return static_cast(const_cast< ArrowCanvas*>(this)); + if (!strcmp(_clname, "Q3CanvasPolygon")) + return static_cast< Q3CanvasPolygon*>(const_cast< ArrowCanvas*>(this)); + if (!strcmp(_clname, "DiagramItem")) + return static_cast< DiagramItem*>(const_cast< ArrowCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ArrowCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ArrowJunctionCanvas.cpp b/src/moc_ArrowJunctionCanvas.cpp new file mode 100644 index 000000000..b968cb468 --- /dev/null +++ b/src/moc_ArrowJunctionCanvas.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ArrowJunctionCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ArrowJunctionCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ArrowJunctionCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ArrowJunctionCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 21, 20, 20, 20, 0x08, + 32, 20, 20, 20, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ArrowJunctionCanvas[] = { + "ArrowJunctionCanvas\0\0modified()\0" + "deleted()\0" +}; + +void ArrowJunctionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ArrowJunctionCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ArrowJunctionCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ArrowJunctionCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ArrowJunctionCanvas, + qt_meta_data_ArrowJunctionCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ArrowJunctionCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ArrowJunctionCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ArrowJunctionCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ArrowJunctionCanvas)) + return static_cast(const_cast< ArrowJunctionCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ArrowJunctionCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ArrowJunctionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ArtifactCanvas.cpp b/src/moc_ArtifactCanvas.cpp new file mode 100644 index 000000000..8b72f24d7 --- /dev/null +++ b/src/moc_ArtifactCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ArtifactCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ArtifactCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ArtifactCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ArtifactCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x08, + 27, 15, 15, 15, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ArtifactCanvas[] = { + "ArtifactCanvas\0\0modified()\0deleted()\0" +}; + +void ArtifactCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ArtifactCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ArtifactCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ArtifactCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ArtifactCanvas, + qt_meta_data_ArtifactCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ArtifactCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ArtifactCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ArtifactCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ArtifactCanvas)) + return static_cast(const_cast< ArtifactCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ArtifactCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ArtifactCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ArtifactData.cpp b/src/moc_ArtifactData.cpp new file mode 100644 index 000000000..6ad0a312d --- /dev/null +++ b/src/moc_ArtifactData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ArtifactData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ArtifactData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ArtifactData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ArtifactData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ArtifactData[] = { + "ArtifactData\0\0on_delete()\0" +}; + +void ArtifactData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ArtifactData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ArtifactData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ArtifactData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_ArtifactData, + qt_meta_data_ArtifactData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ArtifactData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ArtifactData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ArtifactData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ArtifactData)) + return static_cast(const_cast< ArtifactData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int ArtifactData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ArtifactDialog.cpp b/src/moc_ArtifactDialog.cpp new file mode 100644 index 000000000..9deeb85de --- /dev/null +++ b/src/moc_ArtifactDialog.cpp @@ -0,0 +1,186 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ArtifactDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ArtifactDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ArtifactDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ArtifactDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 38, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 25, 15, 15, 15, 0x09, + 34, 15, 15, 15, 0x09, + 43, 15, 15, 15, 0x09, + 65, 15, 15, 15, 0x09, + 84, 15, 15, 15, 0x09, + 115, 15, 15, 15, 0x09, + 136, 15, 15, 15, 0x09, + 149, 15, 15, 15, 0x09, + 164, 15, 15, 15, 0x09, + 180, 15, 15, 15, 0x09, + 197, 15, 15, 15, 0x09, + 212, 15, 15, 15, 0x09, + 229, 15, 15, 15, 0x09, + 247, 15, 15, 15, 0x09, + 266, 15, 15, 15, 0x09, + 278, 15, 15, 15, 0x09, + 296, 15, 15, 15, 0x09, + 315, 15, 15, 15, 0x09, + 335, 15, 15, 15, 0x09, + 346, 15, 15, 15, 0x09, + 363, 15, 15, 15, 0x09, + 381, 15, 15, 15, 0x09, + 400, 15, 15, 15, 0x09, + 414, 15, 15, 15, 0x09, + 434, 15, 15, 15, 0x09, + 455, 15, 15, 15, 0x09, + 477, 15, 15, 15, 0x09, + 488, 15, 15, 15, 0x09, + 505, 15, 15, 15, 0x09, + 523, 15, 15, 15, 0x09, + 542, 15, 15, 15, 0x09, + 558, 15, 15, 15, 0x09, + 576, 15, 15, 15, 0x09, + 590, 15, 15, 15, 0x09, + 606, 15, 15, 15, 0x09, + 623, 15, 15, 15, 0x09, + 642, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ArtifactDialog[] = { + "ArtifactDialog\0\0polish()\0accept()\0" + "reject()\0default_description()\0" + "edit_description()\0edStereotypeActivated(QString)\0" + "update_tab(QWidget*)\0cpp_edit_h()\0" + "cpp_update_h()\0cpp_default_h()\0" + "cpp_unmapped_h()\0cpp_edit_src()\0" + "cpp_update_src()\0cpp_default_src()\0" + "cpp_unmapped_src()\0java_edit()\0" + "java_update_src()\0java_default_src()\0" + "java_unmapped_src()\0php_edit()\0" + "php_update_src()\0php_default_src()\0" + "php_unmapped_src()\0python_edit()\0" + "python_update_src()\0python_default_src()\0" + "python_unmapped_src()\0idl_edit()\0" + "idl_update_src()\0idl_default_src()\0" + "idl_unmapped_src()\0associate_cls()\0" + "unassociate_cls()\0move_cls_up()\0" + "move_cls_down()\0associate_arts()\0" + "unassociate_arts()\0" + "stereotypeFilterActivated(QString)\0" +}; + +void ArtifactDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ArtifactDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->reject(); break; + case 3: _t->default_description(); break; + case 4: _t->edit_description(); break; + case 5: _t->edStereotypeActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 6: _t->update_tab((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + case 7: _t->cpp_edit_h(); break; + case 8: _t->cpp_update_h(); break; + case 9: _t->cpp_default_h(); break; + case 10: _t->cpp_unmapped_h(); break; + case 11: _t->cpp_edit_src(); break; + case 12: _t->cpp_update_src(); break; + case 13: _t->cpp_default_src(); break; + case 14: _t->cpp_unmapped_src(); break; + case 15: _t->java_edit(); break; + case 16: _t->java_update_src(); break; + case 17: _t->java_default_src(); break; + case 18: _t->java_unmapped_src(); break; + case 19: _t->php_edit(); break; + case 20: _t->php_update_src(); break; + case 21: _t->php_default_src(); break; + case 22: _t->php_unmapped_src(); break; + case 23: _t->python_edit(); break; + case 24: _t->python_update_src(); break; + case 25: _t->python_default_src(); break; + case 26: _t->python_unmapped_src(); break; + case 27: _t->idl_edit(); break; + case 28: _t->idl_update_src(); break; + case 29: _t->idl_default_src(); break; + case 30: _t->idl_unmapped_src(); break; + case 31: _t->associate_cls(); break; + case 32: _t->unassociate_cls(); break; + case 33: _t->move_cls_up(); break; + case 34: _t->move_cls_down(); break; + case 35: _t->associate_arts(); break; + case 36: _t->unassociate_arts(); break; + case 37: _t->stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ArtifactDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ArtifactDialog::staticMetaObject = { + { &EdgeMenuDialog::staticMetaObject, qt_meta_stringdata_ArtifactDialog, + qt_meta_data_ArtifactDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ArtifactDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ArtifactDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ArtifactDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ArtifactDialog)) + return static_cast(const_cast< ArtifactDialog*>(this)); + return EdgeMenuDialog::qt_metacast(_clname); +} + +int ArtifactDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = EdgeMenuDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 38) + qt_static_metacall(this, _c, _id, _a); + _id -= 38; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_AttributeData.cpp b/src/moc_AttributeData.cpp new file mode 100644 index 000000000..08d80fcbe --- /dev/null +++ b/src/moc_AttributeData.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'AttributeData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/AttributeData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'AttributeData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_AttributeData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x09, + 27, 14, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_AttributeData[] = { + "AttributeData\0\0on_delete()\0" + "on_delete_idlcase()\0" +}; + +void AttributeData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + AttributeData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + case 1: _t->on_delete_idlcase(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData AttributeData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject AttributeData::staticMetaObject = { + { &ClassMemberData::staticMetaObject, qt_meta_stringdata_AttributeData, + qt_meta_data_AttributeData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &AttributeData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *AttributeData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *AttributeData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_AttributeData)) + return static_cast(const_cast< AttributeData*>(this)); + return ClassMemberData::qt_metacast(_clname); +} + +int AttributeData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ClassMemberData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_AttributeDialog.cpp b/src/moc_AttributeDialog.cpp new file mode 100644 index 000000000..993fd49ed --- /dev/null +++ b/src/moc_AttributeDialog.cpp @@ -0,0 +1,160 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'AttributeDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/AttributeDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'AttributeDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_AttributeDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 28, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + 35, 16, 16, 16, 0x09, + 47, 16, 16, 16, 0x09, + 69, 16, 16, 16, 0x09, + 88, 16, 16, 16, 0x09, + 106, 16, 16, 16, 0x09, + 118, 16, 16, 16, 0x09, + 140, 16, 16, 16, 0x09, + 154, 16, 16, 16, 0x09, + 169, 16, 16, 16, 0x09, + 182, 16, 16, 16, 0x09, + 197, 16, 16, 16, 0x09, + 217, 16, 16, 16, 0x09, + 233, 16, 16, 16, 0x09, + 247, 16, 16, 16, 0x09, + 270, 16, 16, 16, 0x09, + 284, 16, 16, 16, 0x09, + 299, 16, 16, 16, 0x09, + 312, 16, 16, 16, 0x09, + 329, 16, 16, 16, 0x09, + 347, 16, 16, 16, 0x09, + 363, 16, 16, 16, 0x09, + 377, 16, 16, 16, 0x09, + 397, 16, 16, 16, 0x09, + 420, 16, 16, 16, 0x09, + 435, 16, 16, 16, 0x09, + 448, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_AttributeDialog[] = { + "AttributeDialog\0\0polish()\0accept()\0" + "edit_init()\0default_description()\0" + "edit_description()\0edit_constraint()\0" + "menu_type()\0derived_changed(bool)\0" + "cpp_default()\0cpp_unmapped()\0cpp_update()\0" + "java_default()\0java_default_item()\0" + "java_unmapped()\0java_update()\0" + "java_edit_annotation()\0php_default()\0" + "php_unmapped()\0php_update()\0" + "python_default()\0python_unmapped()\0" + "python_update()\0idl_default()\0" + "idl_default_state()\0idl_default_constant()\0" + "idl_unmapped()\0idl_update()\0" + "update_all_tabs(QWidget*)\0" +}; + +void AttributeDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + AttributeDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_init(); break; + case 3: _t->default_description(); break; + case 4: _t->edit_description(); break; + case 5: _t->edit_constraint(); break; + case 6: _t->menu_type(); break; + case 7: _t->derived_changed((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 8: _t->cpp_default(); break; + case 9: _t->cpp_unmapped(); break; + case 10: _t->cpp_update(); break; + case 11: _t->java_default(); break; + case 12: _t->java_default_item(); break; + case 13: _t->java_unmapped(); break; + case 14: _t->java_update(); break; + case 15: _t->java_edit_annotation(); break; + case 16: _t->php_default(); break; + case 17: _t->php_unmapped(); break; + case 18: _t->php_update(); break; + case 19: _t->python_default(); break; + case 20: _t->python_unmapped(); break; + case 21: _t->python_update(); break; + case 22: _t->idl_default(); break; + case 23: _t->idl_default_state(); break; + case 24: _t->idl_default_constant(); break; + case 25: _t->idl_unmapped(); break; + case 26: _t->idl_update(); break; + case 27: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData AttributeDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject AttributeDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_AttributeDialog, + qt_meta_data_AttributeDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &AttributeDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *AttributeDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *AttributeDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_AttributeDialog)) + return static_cast(const_cast< AttributeDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int AttributeDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 28) + qt_static_metacall(this, _c, _id, _a); + _id -= 28; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_BasicData.cpp b/src/moc_BasicData.cpp new file mode 100644 index 000000000..811084520 --- /dev/null +++ b/src/moc_BasicData.cpp @@ -0,0 +1,115 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'BasicData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/BasicData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'BasicData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_BasicData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 2, // signalCount + + // signals: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x05, + 21, 10, 10, 10, 0x05, + + // slots: signature, parameters, type, tag, flags + 31, 10, 10, 10, 0x09, + 43, 10, 10, 10, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_BasicData[] = { + "BasicData\0\0changed()\0deleted()\0" + "on_delete()\0modified()\0" +}; + +void BasicData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + BasicData *_t = static_cast(_o); + switch (_id) { + case 0: _t->changed(); break; + case 1: _t->deleted(); break; + case 2: _t->on_delete(); break; + case 3: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData BasicData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject BasicData::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_BasicData, + qt_meta_data_BasicData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &BasicData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *BasicData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *BasicData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_BasicData)) + return static_cast(const_cast< BasicData*>(this)); + return QObject::qt_metacast(_clname); +} + +int BasicData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} + +// SIGNAL 0 +void BasicData::changed() +{ + QMetaObject::activate(this, &staticMetaObject, 0, 0); +} + +// SIGNAL 1 +void BasicData::deleted() +{ + QMetaObject::activate(this, &staticMetaObject, 1, 0); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_BasicDialog.cpp b/src/moc_BasicDialog.cpp new file mode 100644 index 000000000..9452e014d --- /dev/null +++ b/src/moc_BasicDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'BasicDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/BasicDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'BasicDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_BasicDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x09, + 22, 12, 12, 12, 0x09, + 31, 12, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_BasicDialog[] = { + "BasicDialog\0\0polish()\0accept()\0" + "edit_description()\0" +}; + +void BasicDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + BasicDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData BasicDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject BasicDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_BasicDialog, + qt_meta_data_BasicDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &BasicDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *BasicDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *BasicDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_BasicDialog)) + return static_cast(const_cast< BasicDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int BasicDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_BodyDialog.cpp b/src/moc_BodyDialog.cpp new file mode 100644 index 000000000..9e46a0fc2 --- /dev/null +++ b/src/moc_BodyDialog.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'BodyDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/BodyDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'BodyDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_BodyDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_BodyDialog[] = { + "BodyDialog\0" +}; + +void BodyDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData BodyDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject BodyDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_BodyDialog, + qt_meta_data_BodyDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &BodyDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *BodyDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *BodyDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_BodyDialog)) + return static_cast(const_cast< BodyDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int BodyDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_BrowserSearchDialog.cpp b/src/moc_BrowserSearchDialog.cpp new file mode 100644 index 000000000..a7ef01ec7 --- /dev/null +++ b/src/moc_BrowserSearchDialog.cpp @@ -0,0 +1,107 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'BrowserSearchDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/BrowserSearchDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'BrowserSearchDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_BrowserSearchDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 7, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 21, 20, 20, 20, 0x09, + 30, 20, 20, 20, 0x09, + 39, 20, 20, 20, 0x09, + 48, 20, 20, 20, 0x09, + 62, 20, 20, 20, 0x09, + 76, 20, 20, 20, 0x09, + 88, 20, 20, 20, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_BrowserSearchDialog[] = { + "BrowserSearchDialog\0\0polish()\0search()\0" + "select()\0selected(int)\0mark_unmark()\0" + "mark_them()\0unmark_all()\0" +}; + +void BrowserSearchDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + BrowserSearchDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->search(); break; + case 2: _t->select(); break; + case 3: _t->selected((*reinterpret_cast< int(*)>(_a[1]))); break; + case 4: _t->mark_unmark(); break; + case 5: _t->mark_them(); break; + case 6: _t->unmark_all(); break; + default: ; + } + } +} + +const QMetaObjectExtraData BrowserSearchDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject BrowserSearchDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_BrowserSearchDialog, + qt_meta_data_BrowserSearchDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &BrowserSearchDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *BrowserSearchDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *BrowserSearchDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_BrowserSearchDialog)) + return static_cast(const_cast< BrowserSearchDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int BrowserSearchDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 7) + qt_static_metacall(this, _c, _id, _a); + _id -= 7; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_BrowserView.cpp b/src/moc_BrowserView.cpp new file mode 100644 index 000000000..03d928a15 --- /dev/null +++ b/src/moc_BrowserView.cpp @@ -0,0 +1,146 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'BrowserView.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/BrowserView.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'BrowserView.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_BrowserView[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 17, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x05, + + // slots: signature, parameters, type, tag, flags + 46, 12, 12, 12, 0x09, + 72, 12, 12, 12, 0x09, + 102, 12, 12, 12, 0x09, + 131, 12, 12, 12, 0x09, + 140, 138, 12, 12, 0x09, + 179, 138, 12, 12, 0x09, + 210, 138, 12, 12, 0x09, + 247, 138, 12, 12, 0x09, + 285, 138, 12, 12, 0x09, + 325, 12, 12, 12, 0x0a, + 341, 12, 12, 12, 0x0a, + 358, 12, 12, 12, 0x0a, + 374, 12, 12, 12, 0x0a, + 393, 12, 12, 12, 0x0a, + 419, 409, 12, 12, 0x0a, + 445, 12, 12, 12, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_BrowserView[] = { + "BrowserView\0\0marked_list(QList)\0" + "selected(Q3ListViewItem*)\0" + "rightPressed(Q3ListViewItem*)\0" + "doubleClick(Q3ListViewItem*)\0menu()\0" + "e\0contentsDragMoveEvent(QDragMoveEvent*)\0" + "contentsDropEvent(QDropEvent*)\0" + "contentsMouseMoveEvent(QMouseEvent*)\0" + "contentsMousePressEvent(QMouseEvent*)\0" + "contentsMouseReleaseEvent(QMouseEvent*)\0" + "OnGenerateCpp()\0OnGenerateJava()\0" + "OnGeneratePhp()\0OnGeneratePython()\0" + "OnGenerateIdl()\0name,type\0" + "OnUnmarkItem(QString,int)\0OnUnmarkAll()\0" +}; + +void BrowserView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + BrowserView *_t = static_cast(_o); + switch (_id) { + case 0: _t->marked_list((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 1: _t->selected((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; + case 2: _t->rightPressed((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; + case 3: _t->doubleClick((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; + case 4: _t->menu(); break; + case 5: _t->contentsDragMoveEvent((*reinterpret_cast< QDragMoveEvent*(*)>(_a[1]))); break; + case 6: _t->contentsDropEvent((*reinterpret_cast< QDropEvent*(*)>(_a[1]))); break; + case 7: _t->contentsMouseMoveEvent((*reinterpret_cast< QMouseEvent*(*)>(_a[1]))); break; + case 8: _t->contentsMousePressEvent((*reinterpret_cast< QMouseEvent*(*)>(_a[1]))); break; + case 9: _t->contentsMouseReleaseEvent((*reinterpret_cast< QMouseEvent*(*)>(_a[1]))); break; + case 10: _t->OnGenerateCpp(); break; + case 11: _t->OnGenerateJava(); break; + case 12: _t->OnGeneratePhp(); break; + case 13: _t->OnGeneratePython(); break; + case 14: _t->OnGenerateIdl(); break; + case 15: _t->OnUnmarkItem((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + case 16: _t->OnUnmarkAll(); break; + default: ; + } + } +} + +const QMetaObjectExtraData BrowserView::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject BrowserView::staticMetaObject = { + { &Q3ListView::staticMetaObject, qt_meta_stringdata_BrowserView, + qt_meta_data_BrowserView, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &BrowserView::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *BrowserView::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *BrowserView::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_BrowserView)) + return static_cast(const_cast< BrowserView*>(this)); + return Q3ListView::qt_metacast(_clname); +} + +int BrowserView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3ListView::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 17) + qt_static_metacall(this, _c, _id, _a); + _id -= 17; + } + return _id; +} + +// SIGNAL 0 +void BrowserView::marked_list(QList _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_CdClassCanvas.cpp b/src/moc_CdClassCanvas.cpp new file mode 100644 index 000000000..f8551e2a5 --- /dev/null +++ b/src/moc_CdClassCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CdClassCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/CdClassCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CdClassCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CdClassCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x08, + 26, 14, 14, 14, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_CdClassCanvas[] = { + "CdClassCanvas\0\0modified()\0deleted()\0" +}; + +void CdClassCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CdClassCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CdClassCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CdClassCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_CdClassCanvas, + qt_meta_data_CdClassCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CdClassCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CdClassCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CdClassCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CdClassCanvas)) + return static_cast(const_cast< CdClassCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< CdClassCanvas*>(this)); + if (!strcmp(_clname, "MultipleDependency")) + return static_cast< MultipleDependency*>(const_cast< CdClassCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int CdClassCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassData.cpp b/src/moc_ClassData.cpp new file mode 100644 index 000000000..90f333dcc --- /dev/null +++ b/src/moc_ClassData.cpp @@ -0,0 +1,107 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ClassData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClassData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x05, + + // slots: signature, parameters, type, tag, flags + 29, 10, 10, 10, 0x08, + 46, 10, 10, 10, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassData[] = { + "ClassData\0\0actuals_changed()\0" + "update_actuals()\0on_delete()\0" +}; + +void ClassData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClassData *_t = static_cast(_o); + switch (_id) { + case 0: _t->actuals_changed(); break; + case 1: _t->update_actuals(); break; + case 2: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ClassData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassData::staticMetaObject = { + { &BasicData::staticMetaObject, qt_meta_stringdata_ClassData, + qt_meta_data_ClassData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassData)) + return static_cast(const_cast< ClassData*>(this)); + return BasicData::qt_metacast(_clname); +} + +int ClassData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = BasicData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} + +// SIGNAL 0 +void ClassData::actuals_changed() +{ + QMetaObject::activate(this, &staticMetaObject, 0, 0); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassDiagramWindow.cpp b/src/moc_ClassDiagramWindow.cpp new file mode 100644 index 000000000..a70bb4381 --- /dev/null +++ b/src/moc_ClassDiagramWindow.cpp @@ -0,0 +1,132 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ClassDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClassDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 16, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + 32, 19, 19, 19, 0x09, + 46, 19, 19, 19, 0x09, + 61, 19, 19, 19, 0x09, + 75, 19, 19, 19, 0x09, + 92, 19, 19, 19, 0x09, + 110, 19, 19, 19, 0x09, + 139, 19, 19, 19, 0x09, + 157, 19, 19, 19, 0x09, + 182, 19, 19, 19, 0x09, + 211, 19, 19, 19, 0x09, + 247, 19, 19, 19, 0x09, + 261, 19, 19, 19, 0x09, + 272, 19, 19, 19, 0x09, + 285, 19, 19, 19, 0x09, + 296, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassDiagramWindow[] = { + "ClassDiagramWindow\0\0hit_class()\0" + "hit_package()\0hit_fragment()\0hit_inherit()\0" + "hit_dependency()\0hit_association()\0" + "hit_directionalassociation()\0" + "hit_aggregation()\0hit_aggregationbyvalue()\0" + "hit_directionalaggregation()\0" + "hit_directionalaggregationbyvalue()\0" + "hit_realize()\0hit_note()\0hit_anchor()\0" + "hit_text()\0hit_image()\0" +}; + +void ClassDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClassDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_class(); break; + case 1: _t->hit_package(); break; + case 2: _t->hit_fragment(); break; + case 3: _t->hit_inherit(); break; + case 4: _t->hit_dependency(); break; + case 5: _t->hit_association(); break; + case 6: _t->hit_directionalassociation(); break; + case 7: _t->hit_aggregation(); break; + case 8: _t->hit_aggregationbyvalue(); break; + case 9: _t->hit_directionalaggregation(); break; + case 10: _t->hit_directionalaggregationbyvalue(); break; + case 11: _t->hit_realize(); break; + case 12: _t->hit_note(); break; + case 13: _t->hit_anchor(); break; + case 14: _t->hit_text(); break; + case 15: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ClassDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ClassDiagramWindow, + qt_meta_data_ClassDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassDiagramWindow)) + return static_cast(const_cast< ClassDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int ClassDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 16) + qt_static_metacall(this, _c, _id, _a); + _id -= 16; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassDialog.cpp b/src/moc_ClassDialog.cpp new file mode 100644 index 000000000..fe56e4ab4 --- /dev/null +++ b/src/moc_ClassDialog.cpp @@ -0,0 +1,306 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassDialog.h' +** +** Created: Sat May 25 00:03:48 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ClassDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClassDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 26, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x09, + 22, 12, 12, 12, 0x09, + 31, 12, 12, 12, 0x09, + 53, 12, 12, 12, 0x09, + 72, 12, 12, 12, 0x09, + 90, 12, 12, 12, 0x09, + 121, 12, 12, 12, 0x09, + 135, 12, 12, 12, 0x09, + 156, 12, 12, 12, 0x09, + 176, 12, 12, 12, 0x09, + 202, 12, 12, 12, 0x09, + 220, 12, 12, 12, 0x09, + 239, 12, 12, 12, 0x09, + 259, 12, 12, 12, 0x09, + 278, 12, 12, 12, 0x09, + 298, 12, 12, 12, 0x09, + 319, 12, 12, 12, 0x09, + 342, 12, 12, 12, 0x09, + 360, 12, 12, 12, 0x09, + 379, 12, 12, 12, 0x09, + 399, 12, 12, 12, 0x09, + 420, 12, 12, 12, 0x09, + 442, 12, 12, 12, 0x09, + 465, 12, 12, 12, 0x09, + 483, 12, 12, 12, 0x09, + 502, 12, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassDialog[] = { + "ClassDialog\0\0polish()\0accept()\0" + "default_description()\0edit_description()\0" + "edit_constraint()\0edStereotypeActivated(QString)\0" + "icon_browse()\0icon_root_relative()\0" + "icon_prj_relative()\0update_all_tabs(QWidget*)\0" + "cpp_update_decl()\0cpp_default_decl()\0" + "cpp_unmapped_decl()\0java_update_decl()\0" + "java_default_decl()\0java_unmapped_decl()\0" + "java_edit_annotation()\0php_update_decl()\0" + "php_default_decl()\0php_unmapped_decl()\0" + "python_update_decl()\0python_default_decl()\0" + "python_unmapped_decl()\0idl_update_decl()\0" + "idl_default_decl()\0idl_unmapped_decl()\0" +}; + +void ClassDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClassDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->default_description(); break; + case 3: _t->edit_description(); break; + case 4: _t->edit_constraint(); break; + case 5: _t->edStereotypeActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 6: _t->icon_browse(); break; + case 7: _t->icon_root_relative(); break; + case 8: _t->icon_prj_relative(); break; + case 9: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + case 10: _t->cpp_update_decl(); break; + case 11: _t->cpp_default_decl(); break; + case 12: _t->cpp_unmapped_decl(); break; + case 13: _t->java_update_decl(); break; + case 14: _t->java_default_decl(); break; + case 15: _t->java_unmapped_decl(); break; + case 16: _t->java_edit_annotation(); break; + case 17: _t->php_update_decl(); break; + case 18: _t->php_default_decl(); break; + case 19: _t->php_unmapped_decl(); break; + case 20: _t->python_update_decl(); break; + case 21: _t->python_default_decl(); break; + case 22: _t->python_unmapped_decl(); break; + case 23: _t->idl_update_decl(); break; + case 24: _t->idl_default_decl(); break; + case 25: _t->idl_unmapped_decl(); break; + default: ; + } + } +} + +const QMetaObjectExtraData ClassDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassDialog::staticMetaObject = { + { &EdgeMenuDialog::staticMetaObject, qt_meta_stringdata_ClassDialog, + qt_meta_data_ClassDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassDialog)) + return static_cast(const_cast< ClassDialog*>(this)); + return EdgeMenuDialog::qt_metacast(_clname); +} + +int ClassDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = EdgeMenuDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 26) + qt_static_metacall(this, _c, _id, _a); + _id -= 26; + } + return _id; +} +static const uint qt_meta_data_FormalParamsTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 43, 19, 18, 18, 0x09, + 86, 78, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_FormalParamsTable[] = { + "FormalParamsTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0value_changed(int,int)\0" +}; + +void FormalParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + FormalParamsTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData FormalParamsTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject FormalParamsTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_FormalParamsTable, + qt_meta_data_FormalParamsTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &FormalParamsTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *FormalParamsTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *FormalParamsTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_FormalParamsTable)) + return static_cast(const_cast< FormalParamsTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int FormalParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_ApplicableOnTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 29, 19, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ApplicableOnTable[] = { + "ApplicableOnTable\0\0row,col,,\0" + "button_pressed(int,int,int,QPoint)\0" +}; + +void ApplicableOnTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ApplicableOnTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ApplicableOnTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ApplicableOnTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_ApplicableOnTable, + qt_meta_data_ApplicableOnTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ApplicableOnTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ApplicableOnTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ApplicableOnTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ApplicableOnTable)) + return static_cast(const_cast< ApplicableOnTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int ApplicableOnTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassInstanceData.cpp b/src/moc_ClassInstanceData.cpp new file mode 100644 index 000000000..a0801f64b --- /dev/null +++ b/src/moc_ClassInstanceData.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassInstanceData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ClassInstanceData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassInstanceData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClassInstanceData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x0a, + 27, 18, 18, 18, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassInstanceData[] = { + "ClassInstanceData\0\0check()\0check_rels()\0" +}; + +void ClassInstanceData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClassInstanceData *_t = static_cast(_o); + switch (_id) { + case 0: _t->check(); break; + case 1: _t->check_rels(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ClassInstanceData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassInstanceData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_ClassInstanceData, + qt_meta_data_ClassInstanceData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassInstanceData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassInstanceData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassInstanceData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassInstanceData)) + return static_cast(const_cast< ClassInstanceData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int ClassInstanceData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassInstanceDialog.cpp b/src/moc_ClassInstanceDialog.cpp new file mode 100644 index 000000000..345a32151 --- /dev/null +++ b/src/moc_ClassInstanceDialog.cpp @@ -0,0 +1,179 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassInstanceDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ClassInstanceDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassInstanceDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_RelTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 34, 10, 9, 9, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_RelTable[] = { + "RelTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" +}; + +void RelTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + RelTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData RelTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject RelTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_RelTable, + qt_meta_data_RelTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &RelTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *RelTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *RelTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_RelTable)) + return static_cast(const_cast< RelTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int RelTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +static const uint qt_meta_data_ClassInstanceDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 6, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 21, 20, 20, 20, 0x09, + 30, 20, 20, 20, 0x09, + 39, 20, 20, 20, 0x09, + 58, 20, 20, 20, 0x09, + 76, 20, 20, 20, 0x09, + 89, 20, 20, 20, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassInstanceDialog[] = { + "ClassInstanceDialog\0\0polish()\0accept()\0" + "edit_description()\0type_changed(int)\0" + "menu_class()\0update_all_tabs(QWidget*)\0" +}; + +void ClassInstanceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClassInstanceDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->type_changed((*reinterpret_cast< int(*)>(_a[1]))); break; + case 4: _t->menu_class(); break; + case 5: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ClassInstanceDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassInstanceDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ClassInstanceDialog, + qt_meta_data_ClassInstanceDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassInstanceDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassInstanceDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassInstanceDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassInstanceDialog)) + return static_cast(const_cast< ClassInstanceDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ClassInstanceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 6) + qt_static_metacall(this, _c, _id, _a); + _id -= 6; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassMemberData.cpp b/src/moc_ClassMemberData.cpp new file mode 100644 index 000000000..a3fcf300c --- /dev/null +++ b/src/moc_ClassMemberData.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassMemberData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ClassMemberData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassMemberData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClassMemberData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassMemberData[] = { + "ClassMemberData\0" +}; + +void ClassMemberData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ClassMemberData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassMemberData::staticMetaObject = { + { &BasicData::staticMetaObject, qt_meta_stringdata_ClassMemberData, + qt_meta_data_ClassMemberData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassMemberData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassMemberData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassMemberData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassMemberData)) + return static_cast(const_cast< ClassMemberData*>(this)); + return BasicData::qt_metacast(_clname); +} + +int ClassMemberData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = BasicData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassSettingsDialog.cpp b/src/moc_ClassSettingsDialog.cpp new file mode 100644 index 000000000..8b06b9bb2 --- /dev/null +++ b/src/moc_ClassSettingsDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassSettingsDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ClassSettingsDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassSettingsDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClassSettingsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 21, 20, 20, 20, 0x09, + 30, 20, 20, 20, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassSettingsDialog[] = { + "ClassSettingsDialog\0\0polish()\0accept()\0" +}; + +void ClassSettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClassSettingsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ClassSettingsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassSettingsDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_ClassSettingsDialog, + qt_meta_data_ClassSettingsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassSettingsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassSettingsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassSettingsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassSettingsDialog)) + return static_cast(const_cast< ClassSettingsDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int ClassSettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassViewDialog.cpp b/src/moc_ClassViewDialog.cpp new file mode 100644 index 000000000..471322c4c --- /dev/null +++ b/src/moc_ClassViewDialog.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClassViewDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ClassViewDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClassViewDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClassViewDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + 35, 16, 16, 16, 0x09, + 54, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClassViewDialog[] = { + "ClassViewDialog\0\0polish()\0accept()\0" + "edit_description()\0change_tabs(QWidget*)\0" +}; + +void ClassViewDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClassViewDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ClassViewDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClassViewDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ClassViewDialog, + qt_meta_data_ClassViewDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClassViewDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClassViewDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClassViewDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClassViewDialog)) + return static_cast(const_cast< ClassViewDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ClassViewDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ClipboardManager.cpp b/src/moc_ClipboardManager.cpp new file mode 100644 index 000000000..c2e927df2 --- /dev/null +++ b/src/moc_ClipboardManager.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ClipboardManager.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "misc/ClipboardManager.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ClipboardManager.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ClipboardManager[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 6, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x0a, + 38, 17, 17, 17, 0x0a, + 70, 17, 17, 17, 0x0a, + 104, 17, 17, 17, 0x0a, + 127, 17, 17, 17, 0x0a, + 154, 17, 17, 17, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_ClipboardManager[] = { + "ClipboardManager\0\0OnClipboardUpdate()\0" + "OnPutItemIntoClipboard(QString)\0" + "OnPutItemIntoClipboardRequested()\0" + "OnClipboardRequested()\0" + "OnMoreClipboardRequested()\0" + "OnLessClipboardRequested()\0" +}; + +void ClipboardManager::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ClipboardManager *_t = static_cast(_o); + switch (_id) { + case 0: _t->OnClipboardUpdate(); break; + case 1: _t->OnPutItemIntoClipboard((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 2: _t->OnPutItemIntoClipboardRequested(); break; + case 3: _t->OnClipboardRequested(); break; + case 4: _t->OnMoreClipboardRequested(); break; + case 5: _t->OnLessClipboardRequested(); break; + default: ; + } + } +} + +const QMetaObjectExtraData ClipboardManager::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ClipboardManager::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ClipboardManager, + qt_meta_data_ClipboardManager, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ClipboardManager::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ClipboardManager::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ClipboardManager::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ClipboardManager)) + return static_cast(const_cast< ClipboardManager*>(this)); + return QObject::qt_metacast(_clname); +} + +int ClipboardManager::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 6) + qt_static_metacall(this, _c, _id, _a); + _id -= 6; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_CodAddMsgDialog.cpp b/src/moc_CodAddMsgDialog.cpp new file mode 100644 index 000000000..8de88b3dc --- /dev/null +++ b/src/moc_CodAddMsgDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CodAddMsgDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/CodAddMsgDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CodAddMsgDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CodAddMsgDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 27, 16, 16, 16, 0x09, + 36, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_CodAddMsgDialog[] = { + "CodAddMsgDialog\0\0menu_op()\0polish()\0" + "accept()\0" +}; + +void CodAddMsgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CodAddMsgDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->menu_op(); break; + case 1: _t->polish(); break; + case 2: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CodAddMsgDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CodAddMsgDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_CodAddMsgDialog, + qt_meta_data_CodAddMsgDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CodAddMsgDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CodAddMsgDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CodAddMsgDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CodAddMsgDialog)) + return static_cast(const_cast< CodAddMsgDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int CodAddMsgDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_CodChangeMsgDialog.cpp b/src/moc_CodChangeMsgDialog.cpp new file mode 100644 index 000000000..df1bc1a1e --- /dev/null +++ b/src/moc_CodChangeMsgDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CodChangeMsgDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/CodChangeMsgDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CodChangeMsgDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CodChangeMsgDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + 30, 19, 19, 19, 0x09, + 39, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_CodChangeMsgDialog[] = { + "CodChangeMsgDialog\0\0menu_op()\0polish()\0" + "accept()\0" +}; + +void CodChangeMsgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CodChangeMsgDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->menu_op(); break; + case 1: _t->polish(); break; + case 2: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CodChangeMsgDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CodChangeMsgDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_CodChangeMsgDialog, + qt_meta_data_CodChangeMsgDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CodChangeMsgDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CodChangeMsgDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CodChangeMsgDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CodChangeMsgDialog)) + return static_cast(const_cast< CodChangeMsgDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int CodChangeMsgDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_CodClassInstCanvas.cpp b/src/moc_CodClassInstCanvas.cpp new file mode 100644 index 000000000..eeda124c8 --- /dev/null +++ b/src/moc_CodClassInstCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CodClassInstCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/CodClassInstCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CodClassInstCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CodClassInstCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x08, + 31, 19, 19, 19, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_CodClassInstCanvas[] = { + "CodClassInstCanvas\0\0modified()\0deleted()\0" +}; + +void CodClassInstCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CodClassInstCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CodClassInstCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CodClassInstCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_CodClassInstCanvas, + qt_meta_data_CodClassInstCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CodClassInstCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CodClassInstCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CodClassInstCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CodClassInstCanvas)) + return static_cast(const_cast< CodClassInstCanvas*>(this)); + if (!strcmp(_clname, "CodObjCanvas")) + return static_cast< CodObjCanvas*>(const_cast< CodClassInstCanvas*>(this)); + if (!strcmp(_clname, "ClassInstCanvas")) + return static_cast< ClassInstCanvas*>(const_cast< CodClassInstCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int CodClassInstCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_CodDirsCanvas.cpp b/src/moc_CodDirsCanvas.cpp new file mode 100644 index 000000000..bfb35be26 --- /dev/null +++ b/src/moc_CodDirsCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CodDirsCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/CodDirsCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CodDirsCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CodDirsCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_CodDirsCanvas[] = { + "CodDirsCanvas\0\0modified()\0" +}; + +void CodDirsCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CodDirsCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CodDirsCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CodDirsCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_CodDirsCanvas, + qt_meta_data_CodDirsCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CodDirsCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CodDirsCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CodDirsCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CodDirsCanvas)) + return static_cast(const_cast< CodDirsCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< CodDirsCanvas*>(this)); + if (!strcmp(_clname, "CodMsgSupport")) + return static_cast< CodMsgSupport*>(const_cast< CodDirsCanvas*>(this)); + if (!strcmp(_clname, "MultipleDependency")) + return static_cast< MultipleDependency*>(const_cast< CodDirsCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int CodDirsCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_CodSelfLinkCanvas.cpp b/src/moc_CodSelfLinkCanvas.cpp new file mode 100644 index 000000000..8078e92e2 --- /dev/null +++ b/src/moc_CodSelfLinkCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CodSelfLinkCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/CodSelfLinkCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CodSelfLinkCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CodSelfLinkCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_CodSelfLinkCanvas[] = { + "CodSelfLinkCanvas\0\0modified()\0" +}; + +void CodSelfLinkCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CodSelfLinkCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CodSelfLinkCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CodSelfLinkCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_CodSelfLinkCanvas, + qt_meta_data_CodSelfLinkCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CodSelfLinkCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CodSelfLinkCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CodSelfLinkCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CodSelfLinkCanvas)) + return static_cast(const_cast< CodSelfLinkCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< CodSelfLinkCanvas*>(this)); + if (!strcmp(_clname, "CodMsgSupport")) + return static_cast< CodMsgSupport*>(const_cast< CodSelfLinkCanvas*>(this)); + if (!strcmp(_clname, "MultipleDependency")) + return static_cast< MultipleDependency*>(const_cast< CodSelfLinkCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int CodSelfLinkCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ColDiagramWindow.cpp b/src/moc_ColDiagramWindow.cpp new file mode 100644 index 000000000..988f135a2 --- /dev/null +++ b/src/moc_ColDiagramWindow.cpp @@ -0,0 +1,116 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ColDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ColDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ColDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ColDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 10, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + 30, 17, 17, 17, 0x09, + 50, 17, 17, 17, 0x09, + 64, 17, 17, 17, 0x09, + 79, 17, 17, 17, 0x09, + 90, 17, 17, 17, 0x09, + 105, 17, 17, 17, 0x09, + 116, 17, 17, 17, 0x09, + 129, 17, 17, 17, 0x09, + 140, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ColDiagramWindow[] = { + "ColDiagramWindow\0\0hit_class()\0" + "hit_classinstance()\0hit_package()\0" + "hit_fragment()\0hit_link()\0hit_selflink()\0" + "hit_note()\0hit_anchor()\0hit_text()\0" + "hit_image()\0" +}; + +void ColDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ColDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_class(); break; + case 1: _t->hit_classinstance(); break; + case 2: _t->hit_package(); break; + case 3: _t->hit_fragment(); break; + case 4: _t->hit_link(); break; + case 5: _t->hit_selflink(); break; + case 6: _t->hit_note(); break; + case 7: _t->hit_anchor(); break; + case 8: _t->hit_text(); break; + case 9: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ColDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ColDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ColDiagramWindow, + qt_meta_data_ColDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ColDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ColDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ColDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ColDiagramWindow)) + return static_cast(const_cast< ColDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int ColDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 10) + qt_static_metacall(this, _c, _id, _a); + _id -= 10; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ColMsgTable.cpp b/src/moc_ColMsgTable.cpp new file mode 100644 index 000000000..063b3bc13 --- /dev/null +++ b/src/moc_ColMsgTable.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ColMsgTable.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ColMsgTable.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ColMsgTable.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ColMsgTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 37, 13, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ColMsgTable[] = { + "ColMsgTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" +}; + +void ColMsgTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ColMsgTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ColMsgTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ColMsgTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_ColMsgTable, + qt_meta_data_ColMsgTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ColMsgTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ColMsgTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ColMsgTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ColMsgTable)) + return static_cast(const_cast< ColMsgTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int ColMsgTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentCanvas.cpp b/src/moc_ComponentCanvas.cpp new file mode 100644 index 000000000..538fdc262 --- /dev/null +++ b/src/moc_ComponentCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ComponentCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ComponentCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ComponentCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ComponentCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x08, + 28, 16, 16, 16, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ComponentCanvas[] = { + "ComponentCanvas\0\0modified()\0deleted()\0" +}; + +void ComponentCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ComponentCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ComponentCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ComponentCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ComponentCanvas, + qt_meta_data_ComponentCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ComponentCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ComponentCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ComponentCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ComponentCanvas)) + return static_cast(const_cast< ComponentCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ComponentCanvas*>(this)); + if (!strcmp(_clname, "MultipleDependency")) + return static_cast< MultipleDependency*>(const_cast< ComponentCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ComponentCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentDiagramView.cpp b/src/moc_ComponentDiagramView.cpp new file mode 100644 index 000000000..dbeac05bf --- /dev/null +++ b/src/moc_ComponentDiagramView.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ComponentDiagramView.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ComponentDiagramView.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ComponentDiagramView.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ComponentDiagramView[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_ComponentDiagramView[] = { + "ComponentDiagramView\0" +}; + +void ComponentDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ComponentDiagramView::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ComponentDiagramView::staticMetaObject = { + { &DiagramView::staticMetaObject, qt_meta_stringdata_ComponentDiagramView, + qt_meta_data_ComponentDiagramView, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ComponentDiagramView::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ComponentDiagramView::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ComponentDiagramView::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ComponentDiagramView)) + return static_cast(const_cast< ComponentDiagramView*>(this)); + return DiagramView::qt_metacast(_clname); +} + +int ComponentDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramView::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentDiagramWindow.cpp b/src/moc_ComponentDiagramWindow.cpp new file mode 100644 index 000000000..7fdc8f26d --- /dev/null +++ b/src/moc_ComponentDiagramWindow.cpp @@ -0,0 +1,118 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ComponentDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ComponentDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ComponentDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ComponentDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 11, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 24, 23, 23, 23, 0x09, + 40, 23, 23, 23, 0x09, + 54, 23, 23, 23, 0x09, + 69, 23, 23, 23, 0x09, + 83, 23, 23, 23, 0x09, + 100, 23, 23, 23, 0x09, + 115, 23, 23, 23, 0x09, + 130, 23, 23, 23, 0x09, + 141, 23, 23, 23, 0x09, + 154, 23, 23, 23, 0x09, + 165, 23, 23, 23, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ComponentDiagramWindow[] = { + "ComponentDiagramWindow\0\0hit_component()\0" + "hit_package()\0hit_fragment()\0hit_inherit()\0" + "hit_dependency()\0hit_required()\0" + "hit_provided()\0hit_note()\0hit_anchor()\0" + "hit_text()\0hit_image()\0" +}; + +void ComponentDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ComponentDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_component(); break; + case 1: _t->hit_package(); break; + case 2: _t->hit_fragment(); break; + case 3: _t->hit_inherit(); break; + case 4: _t->hit_dependency(); break; + case 5: _t->hit_required(); break; + case 6: _t->hit_provided(); break; + case 7: _t->hit_note(); break; + case 8: _t->hit_anchor(); break; + case 9: _t->hit_text(); break; + case 10: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ComponentDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ComponentDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ComponentDiagramWindow, + qt_meta_data_ComponentDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ComponentDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ComponentDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ComponentDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ComponentDiagramWindow)) + return static_cast(const_cast< ComponentDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int ComponentDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 11) + qt_static_metacall(this, _c, _id, _a); + _id -= 11; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentDialog.cpp b/src/moc_ComponentDialog.cpp new file mode 100644 index 000000000..168e2aec2 --- /dev/null +++ b/src/moc_ComponentDialog.cpp @@ -0,0 +1,125 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ComponentDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ComponentDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ComponentDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ComponentDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 13, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + 35, 16, 16, 16, 0x09, + 57, 54, 16, 16, 0x09, + 95, 54, 16, 16, 0x09, + 133, 54, 16, 16, 0x09, + 171, 16, 16, 16, 0x09, + 185, 16, 16, 16, 0x09, + 201, 16, 16, 16, 0x09, + 215, 16, 16, 16, 0x09, + 231, 16, 16, 16, 0x09, + 245, 16, 16, 16, 0x09, + 261, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ComponentDialog[] = { + "ComponentDialog\0\0polish()\0accept()\0" + "edit_description()\0st\0" + "rq_stereotypeFilterActivated(QString)\0" + "pr_stereotypeFilterActivated(QString)\0" + "rz_stereotypeFilterActivated(QString)\0" + "require_cls()\0unrequire_cls()\0" + "provide_cls()\0unprovide_cls()\0" + "realize_cls()\0unrealize_cls()\0" + "change_tabs(QWidget*)\0" +}; + +void ComponentDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ComponentDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->rq_stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 4: _t->pr_stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 5: _t->rz_stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 6: _t->require_cls(); break; + case 7: _t->unrequire_cls(); break; + case 8: _t->provide_cls(); break; + case 9: _t->unprovide_cls(); break; + case 10: _t->realize_cls(); break; + case 11: _t->unrealize_cls(); break; + case 12: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ComponentDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ComponentDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ComponentDialog, + qt_meta_data_ComponentDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ComponentDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ComponentDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ComponentDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ComponentDialog)) + return static_cast(const_cast< ComponentDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ComponentDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 13) + qt_static_metacall(this, _c, _id, _a); + _id -= 13; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ConstraintCanvas.cpp b/src/moc_ConstraintCanvas.cpp new file mode 100644 index 000000000..d0326d2ab --- /dev/null +++ b/src/moc_ConstraintCanvas.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ConstraintCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ConstraintCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ConstraintCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ConstraintCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_ConstraintCanvas[] = { + "ConstraintCanvas\0\0update()\0" +}; + +void ConstraintCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ConstraintCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->update(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ConstraintCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ConstraintCanvas::staticMetaObject = { + { &NoteCanvas::staticMetaObject, qt_meta_stringdata_ConstraintCanvas, + qt_meta_data_ConstraintCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ConstraintCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ConstraintCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ConstraintCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ConstraintCanvas)) + return static_cast(const_cast< ConstraintCanvas*>(this)); + return NoteCanvas::qt_metacast(_clname); +} + +int ConstraintCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = NoteCanvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ConstraintDialog.cpp b/src/moc_ConstraintDialog.cpp new file mode 100644 index 000000000..189181616 --- /dev/null +++ b/src/moc_ConstraintDialog.cpp @@ -0,0 +1,177 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ConstraintDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ConstraintDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ConstraintDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ConstraintDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 5, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + 29, 17, 17, 17, 0x09, + 40, 17, 17, 17, 0x09, + 57, 17, 17, 17, 0x09, + 66, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ConstraintDialog[] = { + "ConstraintDialog\0\0show_all()\0hide_all()\0" + "hide_inherited()\0accept()\0polish()\0" +}; + +void ConstraintDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ConstraintDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->show_all(); break; + case 1: _t->hide_all(); break; + case 2: _t->hide_inherited(); break; + case 3: _t->accept(); break; + case 4: _t->polish(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ConstraintDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ConstraintDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_ConstraintDialog, + qt_meta_data_ConstraintDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ConstraintDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ConstraintDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ConstraintDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ConstraintDialog)) + return static_cast(const_cast< ConstraintDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int ConstraintDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 5) + qt_static_metacall(this, _c, _id, _a); + _id -= 5; + } + return _id; +} +static const uint qt_meta_data_ConstraintTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 41, 17, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ConstraintTable[] = { + "ConstraintTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" +}; + +void ConstraintTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ConstraintTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ConstraintTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ConstraintTable::staticMetaObject = { + { &Q3Table::staticMetaObject, qt_meta_stringdata_ConstraintTable, + qt_meta_data_ConstraintTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ConstraintTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ConstraintTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ConstraintTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ConstraintTable)) + return static_cast(const_cast< ConstraintTable*>(this)); + return Q3Table::qt_metacast(_clname); +} + +int ConstraintTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3Table::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ContinuationDialog.cpp b/src/moc_ContinuationDialog.cpp new file mode 100644 index 000000000..9219944ca --- /dev/null +++ b/src/moc_ContinuationDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ContinuationDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ContinuationDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ContinuationDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ContinuationDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + 29, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ContinuationDialog[] = { + "ContinuationDialog\0\0polish()\0accept()\0" +}; + +void ContinuationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ContinuationDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ContinuationDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ContinuationDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_ContinuationDialog, + qt_meta_data_ContinuationDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ContinuationDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ContinuationDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ContinuationDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ContinuationDialog)) + return static_cast(const_cast< ContinuationDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int ContinuationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_DecoratorDialog.cpp b/src/moc_DecoratorDialog.cpp new file mode 100644 index 000000000..257845925 --- /dev/null +++ b/src/moc_DecoratorDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'DecoratorDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/DecoratorDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'DecoratorDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DecoratorDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_DecoratorDialog[] = { + "DecoratorDialog\0\0accept()\0add_decorator()\0" +}; + +void DecoratorDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + DecoratorDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->accept(); break; + case 1: _t->add_decorator(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData DecoratorDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DecoratorDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_DecoratorDialog, + qt_meta_data_DecoratorDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DecoratorDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DecoratorDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DecoratorDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DecoratorDialog)) + return static_cast(const_cast< DecoratorDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int DecoratorDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_DeploymentDiagramView.cpp b/src/moc_DeploymentDiagramView.cpp new file mode 100644 index 000000000..1dabc89cf --- /dev/null +++ b/src/moc_DeploymentDiagramView.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'DeploymentDiagramView.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/DeploymentDiagramView.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'DeploymentDiagramView.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DeploymentDiagramView[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_DeploymentDiagramView[] = { + "DeploymentDiagramView\0" +}; + +void DeploymentDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData DeploymentDiagramView::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DeploymentDiagramView::staticMetaObject = { + { &DiagramView::staticMetaObject, qt_meta_stringdata_DeploymentDiagramView, + qt_meta_data_DeploymentDiagramView, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DeploymentDiagramView::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DeploymentDiagramView::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DeploymentDiagramView::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DeploymentDiagramView)) + return static_cast(const_cast< DeploymentDiagramView*>(this)); + return DiagramView::qt_metacast(_clname); +} + +int DeploymentDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramView::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_DeploymentDiagramWindow.cpp b/src/moc_DeploymentDiagramWindow.cpp new file mode 100644 index 000000000..2dc5c73cb --- /dev/null +++ b/src/moc_DeploymentDiagramWindow.cpp @@ -0,0 +1,126 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'DeploymentDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/DeploymentDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'DeploymentDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DeploymentDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 14, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 25, 24, 24, 24, 0x09, + 39, 24, 24, 24, 0x09, + 54, 24, 24, 24, 0x09, + 75, 24, 24, 24, 0x09, + 91, 24, 24, 24, 0x09, + 106, 24, 24, 24, 0x09, + 120, 24, 24, 24, 0x09, + 134, 24, 24, 24, 0x09, + 144, 24, 24, 24, 0x09, + 162, 24, 24, 24, 0x09, + 179, 24, 24, 24, 0x09, + 190, 24, 24, 24, 0x09, + 203, 24, 24, 24, 0x09, + 214, 24, 24, 24, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_DeploymentDiagramWindow[] = { + "DeploymentDiagramWindow\0\0hit_package()\0" + "hit_fragment()\0hit_deploymentnode()\0" + "hit_component()\0hit_artifact()\0" + "hit_inherit()\0hit_network()\0hit_hub()\0" + "hit_association()\0hit_dependency()\0" + "hit_note()\0hit_anchor()\0hit_text()\0" + "hit_image()\0" +}; + +void DeploymentDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + DeploymentDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_package(); break; + case 1: _t->hit_fragment(); break; + case 2: _t->hit_deploymentnode(); break; + case 3: _t->hit_component(); break; + case 4: _t->hit_artifact(); break; + case 5: _t->hit_inherit(); break; + case 6: _t->hit_network(); break; + case 7: _t->hit_hub(); break; + case 8: _t->hit_association(); break; + case 9: _t->hit_dependency(); break; + case 10: _t->hit_note(); break; + case 11: _t->hit_anchor(); break; + case 12: _t->hit_text(); break; + case 13: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData DeploymentDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DeploymentDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_DeploymentDiagramWindow, + qt_meta_data_DeploymentDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DeploymentDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DeploymentDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DeploymentDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DeploymentDiagramWindow)) + return static_cast(const_cast< DeploymentDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int DeploymentDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 14) + qt_static_metacall(this, _c, _id, _a); + _id -= 14; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_DeploymentNodeCanvas.cpp b/src/moc_DeploymentNodeCanvas.cpp new file mode 100644 index 000000000..53ef97514 --- /dev/null +++ b/src/moc_DeploymentNodeCanvas.cpp @@ -0,0 +1,101 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'DeploymentNodeCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/DeploymentNodeCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'DeploymentNodeCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DeploymentNodeCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x08, + 33, 21, 21, 21, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_DeploymentNodeCanvas[] = { + "DeploymentNodeCanvas\0\0modified()\0" + "deleted()\0" +}; + +void DeploymentNodeCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + DeploymentNodeCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData DeploymentNodeCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DeploymentNodeCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_DeploymentNodeCanvas, + qt_meta_data_DeploymentNodeCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DeploymentNodeCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DeploymentNodeCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DeploymentNodeCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DeploymentNodeCanvas)) + return static_cast(const_cast< DeploymentNodeCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< DeploymentNodeCanvas*>(this)); + if (!strcmp(_clname, "Instance")) + return static_cast< Instance*>(const_cast< DeploymentNodeCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int DeploymentNodeCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_DiagramView.cpp b/src/moc_DiagramView.cpp new file mode 100644 index 000000000..c7669a432 --- /dev/null +++ b/src/moc_DiagramView.cpp @@ -0,0 +1,104 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'DiagramView.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/DiagramView.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'DiagramView.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DiagramView[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 5, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 13, 12, 12, 0x09, + 41, 12, 12, 12, 0x08, + 69, 12, 12, 12, 0x08, + 91, 12, 12, 12, 0x08, + 113, 12, 12, 12, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_DiagramView[] = { + "DiagramView\0\0e\0keyPressEvent(QKeyEvent*)\0" + "keyReleaseEvent(QKeyEvent*)\0" + "optimal_window_size()\0restore_window_size()\0" + "update()\0" +}; + +void DiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + DiagramView *_t = static_cast(_o); + switch (_id) { + case 0: _t->keyPressEvent((*reinterpret_cast< QKeyEvent*(*)>(_a[1]))); break; + case 1: _t->keyReleaseEvent((*reinterpret_cast< QKeyEvent*(*)>(_a[1]))); break; + case 2: _t->optimal_window_size(); break; + case 3: _t->restore_window_size(); break; + case 4: _t->update(); break; + default: ; + } + } +} + +const QMetaObjectExtraData DiagramView::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DiagramView::staticMetaObject = { + { &Q3CanvasView::staticMetaObject, qt_meta_stringdata_DiagramView, + qt_meta_data_DiagramView, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DiagramView::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DiagramView::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DiagramView::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DiagramView)) + return static_cast(const_cast< DiagramView*>(this)); + return Q3CanvasView::qt_metacast(_clname); +} + +int DiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3CanvasView::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 5) + qt_static_metacall(this, _c, _id, _a); + _id -= 5; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_DiagramWindow.cpp b/src/moc_DiagramWindow.cpp new file mode 100644 index 000000000..b7f70c2af --- /dev/null +++ b/src/moc_DiagramWindow.cpp @@ -0,0 +1,105 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'DiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/DiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'DiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 6, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x0a, + 30, 14, 14, 14, 0x0a, + 42, 14, 14, 14, 0x0a, + 64, 14, 14, 14, 0x0a, + 86, 14, 14, 14, 0x0a, + 98, 14, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_DiagramWindow[] = { + "DiagramWindow\0\0new_scale(int)\0fit_scale()\0" + "optimal_window_size()\0session_window_size()\0" + "call_menu()\0hit_select()\0" +}; + +void DiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + DiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->new_scale((*reinterpret_cast< int(*)>(_a[1]))); break; + case 1: _t->fit_scale(); break; + case 2: _t->optimal_window_size(); break; + case 3: _t->session_window_size(); break; + case 4: _t->call_menu(); break; + case 5: _t->hit_select(); break; + default: ; + } + } +} + +const QMetaObjectExtraData DiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DiagramWindow::staticMetaObject = { + { &Q3MainWindow::staticMetaObject, qt_meta_stringdata_DiagramWindow, + qt_meta_data_DiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DiagramWindow)) + return static_cast(const_cast< DiagramWindow*>(this)); + return Q3MainWindow::qt_metacast(_clname); +} + +int DiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3MainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 6) + qt_static_metacall(this, _c, _id, _a); + _id -= 6; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_DialogTimer.cpp b/src/moc_DialogTimer.cpp new file mode 100644 index 000000000..2b2a17efc --- /dev/null +++ b/src/moc_DialogTimer.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'DialogTimer.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/DialogTimer.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'DialogTimer.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DialogTimer[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_DialogTimer[] = { + "DialogTimer\0\0readfile()\0" +}; + +void DialogTimer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + DialogTimer *_t = static_cast(_o); + switch (_id) { + case 0: _t->readfile(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData DialogTimer::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DialogTimer::staticMetaObject = { + { &QTimer::staticMetaObject, qt_meta_stringdata_DialogTimer, + qt_meta_data_DialogTimer, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DialogTimer::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DialogTimer::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DialogTimer::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DialogTimer)) + return static_cast(const_cast< DialogTimer*>(this)); + return QTimer::qt_metacast(_clname); +} + +int DialogTimer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QTimer::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_EdgeMenuDialog.cpp b/src/moc_EdgeMenuDialog.cpp new file mode 100644 index 000000000..44ec198c2 --- /dev/null +++ b/src/moc_EdgeMenuDialog.cpp @@ -0,0 +1,147 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'EdgeMenuDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/EdgeMenuDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'EdgeMenuDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_EdgeMenuDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 10, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 4, // signalCount + + // signals: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x05, + 40, 15, 15, 15, 0x05, + 52, 15, 15, 15, 0x05, + 67, 15, 15, 15, 0x05, + + // slots: signature, parameters, type, tag, flags + 90, 15, 15, 15, 0x0a, + 110, 15, 15, 15, 0x0a, + 134, 15, 15, 15, 0x0a, + 157, 15, 15, 15, 0x0a, + 182, 15, 15, 15, 0x0a, + 215, 15, 15, 15, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_EdgeMenuDialog[] = { + "EdgeMenuDialog\0\0edgeMenuRequested(uint)\0" + "lostFocus()\0hideEdgeMenu()\0" + "repositionMenu(QPoint)\0OnPickNextSibling()\0" + "OnPickPreviousSibling()\0OnInitiateMove(QPoint)\0" + "OnInitiateResize(QPoint)\0" + "OnNewCoordinatesReceived(QPoint)\0" + "OnChangeTab(int)\0" +}; + +void EdgeMenuDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + EdgeMenuDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->edgeMenuRequested((*reinterpret_cast< uint(*)>(_a[1]))); break; + case 1: _t->lostFocus(); break; + case 2: _t->hideEdgeMenu(); break; + case 3: _t->repositionMenu((*reinterpret_cast< const QPoint(*)>(_a[1]))); break; + case 4: _t->OnPickNextSibling(); break; + case 5: _t->OnPickPreviousSibling(); break; + case 6: _t->OnInitiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 7: _t->OnInitiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 8: _t->OnNewCoordinatesReceived((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 9: _t->OnChangeTab((*reinterpret_cast< int(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData EdgeMenuDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject EdgeMenuDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_EdgeMenuDialog, + qt_meta_data_EdgeMenuDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &EdgeMenuDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *EdgeMenuDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *EdgeMenuDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuDialog)) + return static_cast(const_cast< EdgeMenuDialog*>(this)); + if (!strcmp(_clname, "EdgeMenuDialogBase")) + return static_cast< EdgeMenuDialogBase*>(const_cast< EdgeMenuDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int EdgeMenuDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 10) + qt_static_metacall(this, _c, _id, _a); + _id -= 10; + } + return _id; +} + +// SIGNAL 0 +void EdgeMenuDialog::edgeMenuRequested(uint _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} + +// SIGNAL 1 +void EdgeMenuDialog::lostFocus() +{ + QMetaObject::activate(this, &staticMetaObject, 1, 0); +} + +// SIGNAL 2 +void EdgeMenuDialog::hideEdgeMenu() +{ + QMetaObject::activate(this, &staticMetaObject, 2, 0); +} + +// SIGNAL 3 +void EdgeMenuDialog::repositionMenu(const QPoint & _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 3, _a); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_EdgeMenuFactory.cpp b/src/moc_EdgeMenuFactory.cpp new file mode 100644 index 000000000..e39dbf88e --- /dev/null +++ b/src/moc_EdgeMenuFactory.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'EdgeMenuFactory.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "Factories/EdgeMenuFactory.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'EdgeMenuFactory.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_EdgeMenuFactory[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 25, 17, 16, 16, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_EdgeMenuFactory[] = { + "EdgeMenuFactory\0\0classID\0" + "OnEdgeMenuRequested(uint)\0" +}; + +void EdgeMenuFactory::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + EdgeMenuFactory *_t = static_cast(_o); + switch (_id) { + case 0: _t->OnEdgeMenuRequested((*reinterpret_cast< uint(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData EdgeMenuFactory::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject EdgeMenuFactory::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_EdgeMenuFactory, + qt_meta_data_EdgeMenuFactory, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &EdgeMenuFactory::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *EdgeMenuFactory::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *EdgeMenuFactory::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuFactory)) + return static_cast(const_cast< EdgeMenuFactory*>(this)); + return QObject::qt_metacast(_clname); +} + +int EdgeMenuFactory::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_EdgeMenuToolBar.cpp b/src/moc_EdgeMenuToolBar.cpp new file mode 100644 index 000000000..2dc66c68d --- /dev/null +++ b/src/moc_EdgeMenuToolBar.cpp @@ -0,0 +1,135 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'EdgeMenuToolBar.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "CustomWidgets/EdgeMenuToolBar.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'EdgeMenuToolBar.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_EdgeMenuToolBar[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 13, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x05, + + // slots: signature, parameters, type, tag, flags + 43, 16, 16, 16, 0x0a, + 66, 16, 16, 16, 0x0a, + 91, 16, 16, 16, 0x0a, + 124, 16, 16, 16, 0x0a, + 138, 16, 16, 16, 0x0a, + 150, 16, 16, 16, 0x0a, + 173, 16, 16, 16, 0x0a, + 200, 16, 16, 16, 0x0a, + 227, 16, 16, 16, 0x0a, + 257, 16, 16, 16, 0x0a, + 277, 16, 16, 16, 0x0a, + 299, 16, 16, 16, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_EdgeMenuToolBar[] = { + "EdgeMenuToolBar\0\0putIntoClipboard(QString)\0" + "OnInitiateMove(QPoint)\0OnInitiateResize(QPoint)\0" + "OnNewCoordinatesReceived(QPoint)\0" + "OnEndResize()\0OnEndMove()\0" + "OnClipboardRequested()\0" + "OnMoreClipboardRequested()\0" + "OnLessClipboardRequested()\0" + "OnPutIntoClipboardRequested()\0" + "OnDialogLostFocus()\0OnMenuHideRequested()\0" + "OnMenuRepositionRequested(QPoint)\0" +}; + +void EdgeMenuToolBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + EdgeMenuToolBar *_t = static_cast(_o); + switch (_id) { + case 0: _t->putIntoClipboard((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 1: _t->OnInitiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 2: _t->OnInitiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 3: _t->OnNewCoordinatesReceived((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 4: _t->OnEndResize(); break; + case 5: _t->OnEndMove(); break; + case 6: _t->OnClipboardRequested(); break; + case 7: _t->OnMoreClipboardRequested(); break; + case 8: _t->OnLessClipboardRequested(); break; + case 9: _t->OnPutIntoClipboardRequested(); break; + case 10: _t->OnDialogLostFocus(); break; + case 11: _t->OnMenuHideRequested(); break; + case 12: _t->OnMenuRepositionRequested((*reinterpret_cast< const QPoint(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData EdgeMenuToolBar::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject EdgeMenuToolBar::staticMetaObject = { + { &QToolBar::staticMetaObject, qt_meta_stringdata_EdgeMenuToolBar, + qt_meta_data_EdgeMenuToolBar, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &EdgeMenuToolBar::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *EdgeMenuToolBar::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *EdgeMenuToolBar::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuToolBar)) + return static_cast(const_cast< EdgeMenuToolBar*>(this)); + return QToolBar::qt_metacast(_clname); +} + +int EdgeMenuToolBar::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QToolBar::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 13) + qt_static_metacall(this, _c, _id, _a); + _id -= 13; + } + return _id; +} + +// SIGNAL 0 +void EdgeMenuToolBar::putIntoClipboard(QString _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_EnvDialog.cpp b/src/moc_EnvDialog.cpp new file mode 100644 index 000000000..4b4969f30 --- /dev/null +++ b/src/moc_EnvDialog.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'EnvDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/EnvDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'EnvDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_EnvDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 7, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x08, + 20, 10, 10, 10, 0x08, + 29, 10, 10, 10, 0x08, + 42, 10, 10, 10, 0x08, + 61, 10, 10, 10, 0x08, + 79, 10, 10, 10, 0x08, + 95, 10, 10, 10, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_EnvDialog[] = { + "EnvDialog\0\0accept()\0reject()\0doc_browse()\0" + "navigator_browse()\0template_browse()\0" + "editor_browse()\0lang_browse()\0" +}; + +void EnvDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + EnvDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->accept(); break; + case 1: _t->reject(); break; + case 2: _t->doc_browse(); break; + case 3: _t->navigator_browse(); break; + case 4: _t->template_browse(); break; + case 5: _t->editor_browse(); break; + case 6: _t->lang_browse(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData EnvDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject EnvDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_EnvDialog, + qt_meta_data_EnvDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &EnvDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *EnvDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *EnvDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_EnvDialog)) + return static_cast(const_cast< EnvDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int EnvDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 7) + qt_static_metacall(this, _c, _id, _a); + _id -= 7; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ExpansionNodeCanvas.cpp b/src/moc_ExpansionNodeCanvas.cpp new file mode 100644 index 000000000..b63adaeb4 --- /dev/null +++ b/src/moc_ExpansionNodeCanvas.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ExpansionNodeCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ExpansionNodeCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ExpansionNodeCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ExpansionNodeCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 21, 20, 20, 20, 0x08, + 32, 20, 20, 20, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ExpansionNodeCanvas[] = { + "ExpansionNodeCanvas\0\0modified()\0" + "deleted()\0" +}; + +void ExpansionNodeCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ExpansionNodeCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ExpansionNodeCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ExpansionNodeCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ExpansionNodeCanvas, + qt_meta_data_ExpansionNodeCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ExpansionNodeCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ExpansionNodeCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ExpansionNodeCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ExpansionNodeCanvas)) + return static_cast(const_cast< ExpansionNodeCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ExpansionNodeCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ExpansionNodeCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ExpansionRegionCanvas.cpp b/src/moc_ExpansionRegionCanvas.cpp new file mode 100644 index 000000000..a36c4e4a5 --- /dev/null +++ b/src/moc_ExpansionRegionCanvas.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ExpansionRegionCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ExpansionRegionCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ExpansionRegionCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ExpansionRegionCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 23, 22, 22, 22, 0x08, + 34, 22, 22, 22, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ExpansionRegionCanvas[] = { + "ExpansionRegionCanvas\0\0modified()\0" + "deleted()\0" +}; + +void ExpansionRegionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ExpansionRegionCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ExpansionRegionCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ExpansionRegionCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ExpansionRegionCanvas, + qt_meta_data_ExpansionRegionCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ExpansionRegionCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ExpansionRegionCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ExpansionRegionCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ExpansionRegionCanvas)) + return static_cast(const_cast< ExpansionRegionCanvas*>(this)); + if (!strcmp(_clname, "ActivityContainerCanvas")) + return static_cast< ActivityContainerCanvas*>(const_cast< ExpansionRegionCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ExpansionRegionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ExpansionRegionDialog.cpp b/src/moc_ExpansionRegionDialog.cpp new file mode 100644 index 000000000..0a8b8fb7c --- /dev/null +++ b/src/moc_ExpansionRegionDialog.cpp @@ -0,0 +1,101 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ExpansionRegionDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ExpansionRegionDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ExpansionRegionDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ExpansionRegionDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 23, 22, 22, 22, 0x09, + 32, 22, 22, 22, 0x09, + 41, 22, 22, 22, 0x09, + 60, 22, 22, 22, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ExpansionRegionDialog[] = { + "ExpansionRegionDialog\0\0polish()\0" + "accept()\0edit_description()\0" + "change_tabs(QWidget*)\0" +}; + +void ExpansionRegionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ExpansionRegionDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ExpansionRegionDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ExpansionRegionDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ExpansionRegionDialog, + qt_meta_data_ExpansionRegionDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ExpansionRegionDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ExpansionRegionDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ExpansionRegionDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ExpansionRegionDialog)) + return static_cast(const_cast< ExpansionRegionDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ExpansionRegionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ExtraMemberData.cpp b/src/moc_ExtraMemberData.cpp new file mode 100644 index 000000000..c4e2392d3 --- /dev/null +++ b/src/moc_ExtraMemberData.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ExtraMemberData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ExtraMemberData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ExtraMemberData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ExtraMemberData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_ExtraMemberData[] = { + "ExtraMemberData\0" +}; + +void ExtraMemberData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ExtraMemberData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ExtraMemberData::staticMetaObject = { + { &BasicData::staticMetaObject, qt_meta_stringdata_ExtraMemberData, + qt_meta_data_ExtraMemberData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ExtraMemberData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ExtraMemberData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ExtraMemberData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ExtraMemberData)) + return static_cast(const_cast< ExtraMemberData*>(this)); + return BasicData::qt_metacast(_clname); +} + +int ExtraMemberData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = BasicData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ExtraMemberDialog.cpp b/src/moc_ExtraMemberDialog.cpp new file mode 100644 index 000000000..3c9464279 --- /dev/null +++ b/src/moc_ExtraMemberDialog.cpp @@ -0,0 +1,114 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ExtraMemberDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ExtraMemberDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ExtraMemberDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ExtraMemberDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 9, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x09, + 28, 18, 18, 18, 0x09, + 37, 18, 18, 18, 0x09, + 53, 18, 18, 18, 0x09, + 68, 18, 18, 18, 0x09, + 85, 18, 18, 18, 0x09, + 101, 18, 18, 18, 0x09, + 120, 18, 18, 18, 0x09, + 136, 18, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ExtraMemberDialog[] = { + "ExtraMemberDialog\0\0polish()\0accept()\0" + "edit_cpp_decl()\0edit_cpp_def()\0" + "edit_java_decl()\0edit_php_decl()\0" + "edit_python_decl()\0edit_idl_decl()\0" + "edit_description()\0" +}; + +void ExtraMemberDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ExtraMemberDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_cpp_decl(); break; + case 3: _t->edit_cpp_def(); break; + case 4: _t->edit_java_decl(); break; + case 5: _t->edit_php_decl(); break; + case 6: _t->edit_python_decl(); break; + case 7: _t->edit_idl_decl(); break; + case 8: _t->edit_description(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ExtraMemberDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ExtraMemberDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ExtraMemberDialog, + qt_meta_data_ExtraMemberDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ExtraMemberDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ExtraMemberDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ExtraMemberDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ExtraMemberDialog)) + return static_cast(const_cast< ExtraMemberDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ExtraMemberDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 9) + qt_static_metacall(this, _c, _id, _a); + _id -= 9; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_FlowCanvas.cpp b/src/moc_FlowCanvas.cpp new file mode 100644 index 000000000..7f09c6c0e --- /dev/null +++ b/src/moc_FlowCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'FlowCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/FlowCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'FlowCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_FlowCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x08, + 23, 11, 11, 11, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_FlowCanvas[] = { + "FlowCanvas\0\0modified()\0deleted()\0" +}; + +void FlowCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + FlowCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData FlowCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject FlowCanvas::staticMetaObject = { + { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_FlowCanvas, + qt_meta_data_FlowCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &FlowCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *FlowCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *FlowCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_FlowCanvas)) + return static_cast(const_cast< FlowCanvas*>(this)); + return ArrowCanvas::qt_metacast(_clname); +} + +int FlowCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ArrowCanvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_FlowData.cpp b/src/moc_FlowData.cpp new file mode 100644 index 000000000..b2c015ff3 --- /dev/null +++ b/src/moc_FlowData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'FlowData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/FlowData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'FlowData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_FlowData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 10, 9, 9, 9, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_FlowData[] = { + "FlowData\0\0end_deleted()\0" +}; + +void FlowData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + FlowData *_t = static_cast(_o); + switch (_id) { + case 0: _t->end_deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData FlowData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject FlowData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_FlowData, + qt_meta_data_FlowData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &FlowData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *FlowData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *FlowData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_FlowData)) + return static_cast(const_cast< FlowData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int FlowData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_FlowDialog.cpp b/src/moc_FlowDialog.cpp new file mode 100644 index 000000000..857ecdf0e --- /dev/null +++ b/src/moc_FlowDialog.cpp @@ -0,0 +1,123 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'FlowDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/FlowDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'FlowDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_FlowDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 13, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x09, + 21, 11, 11, 11, 0x09, + 30, 11, 11, 11, 0x09, + 49, 11, 11, 11, 0x09, + 66, 11, 11, 11, 0x09, + 87, 11, 11, 11, 0x09, + 113, 11, 11, 11, 0x09, + 130, 11, 11, 11, 0x09, + 151, 11, 11, 11, 0x09, + 177, 11, 11, 11, 0x09, + 195, 11, 11, 11, 0x09, + 217, 11, 11, 11, 0x09, + 244, 11, 11, 11, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_FlowDialog[] = { + "FlowDialog\0\0polish()\0accept()\0" + "edit_description()\0edit_uml_guard()\0" + "edit_uml_selection()\0edit_uml_transformation()\0" + "edit_cpp_guard()\0edit_cpp_selection()\0" + "edit_cpp_transformation()\0edit_java_guard()\0" + "edit_java_selection()\0edit_java_transformation()\0" + "change_tabs(QWidget*)\0" +}; + +void FlowDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + FlowDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->edit_uml_guard(); break; + case 4: _t->edit_uml_selection(); break; + case 5: _t->edit_uml_transformation(); break; + case 6: _t->edit_cpp_guard(); break; + case 7: _t->edit_cpp_selection(); break; + case 8: _t->edit_cpp_transformation(); break; + case 9: _t->edit_java_guard(); break; + case 10: _t->edit_java_selection(); break; + case 11: _t->edit_java_transformation(); break; + case 12: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData FlowDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject FlowDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_FlowDialog, + qt_meta_data_FlowDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &FlowDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *FlowDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *FlowDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_FlowDialog)) + return static_cast(const_cast< FlowDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int FlowDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 13) + qt_static_metacall(this, _c, _id, _a); + _id -= 13; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_FormalParamData.cpp b/src/moc_FormalParamData.cpp new file mode 100644 index 000000000..747af85eb --- /dev/null +++ b/src/moc_FormalParamData.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'FormalParamData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/FormalParamData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'FormalParamData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_FormalParamData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 37, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_FormalParamData[] = { + "FormalParamData\0\0on_delete_default()\0" + "on_delete_extends()\0" +}; + +void FormalParamData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + FormalParamData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete_default(); break; + case 1: _t->on_delete_extends(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData FormalParamData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject FormalParamData::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_FormalParamData, + qt_meta_data_FormalParamData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &FormalParamData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *FormalParamData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *FormalParamData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_FormalParamData)) + return static_cast(const_cast< FormalParamData*>(this)); + return QObject::qt_metacast(_clname); +} + +int FormalParamData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_FragmentCanvas.cpp b/src/moc_FragmentCanvas.cpp new file mode 100644 index 000000000..6ea9f02b2 --- /dev/null +++ b/src/moc_FragmentCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'FragmentCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/FragmentCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'FragmentCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_FragmentCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_FragmentCanvas[] = { + "FragmentCanvas\0\0modified()\0" +}; + +void FragmentCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + FragmentCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData FragmentCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject FragmentCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_FragmentCanvas, + qt_meta_data_FragmentCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &FragmentCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *FragmentCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *FragmentCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_FragmentCanvas)) + return static_cast(const_cast< FragmentCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< FragmentCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int FragmentCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_FragmentDialog.cpp b/src/moc_FragmentDialog.cpp new file mode 100644 index 000000000..9b6bff0c8 --- /dev/null +++ b/src/moc_FragmentDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'FragmentDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/FragmentDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'FragmentDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_FragmentDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 25, 15, 15, 15, 0x09, + 34, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_FragmentDialog[] = { + "FragmentDialog\0\0polish()\0accept()\0" + "menu_refer()\0" +}; + +void FragmentDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + FragmentDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->menu_refer(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData FragmentDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject FragmentDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_FragmentDialog, + qt_meta_data_FragmentDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &FragmentDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *FragmentDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *FragmentDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_FragmentDialog)) + return static_cast(const_cast< FragmentDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int FragmentDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_GenerationSettingsBuiltinTable.cpp b/src/moc_GenerationSettingsBuiltinTable.cpp new file mode 100644 index 000000000..e25376b8b --- /dev/null +++ b/src/moc_GenerationSettingsBuiltinTable.cpp @@ -0,0 +1,111 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'GenerationSettingsBuiltinTable.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/GenerationSettingsBuiltinTable.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'GenerationSettingsBuiltinTable.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_BuiltinTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 8, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x0a, + 31, 13, 13, 13, 0x0a, + 44, 13, 13, 13, 0x0a, + 58, 13, 13, 13, 0x0a, + 70, 13, 13, 13, 0x0a, + 81, 13, 13, 13, 0x0a, + 108, 13, 13, 13, 0x0a, + 135, 13, 13, 13, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_BuiltinTable[] = { + "BuiltinTable\0\0OnInsertNewRow()\0" + "OnPasteRow()\0OnDeleteRow()\0OnCopyRow()\0" + "OnCutRow()\0OnCallRowMenu(QModelIndex)\0" + "OnSetParameterVisibility()\0" + "OnFilterTable(QString)\0" +}; + +void BuiltinTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + BuiltinTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->OnInsertNewRow(); break; + case 1: _t->OnPasteRow(); break; + case 2: _t->OnDeleteRow(); break; + case 3: _t->OnCopyRow(); break; + case 4: _t->OnCutRow(); break; + case 5: _t->OnCallRowMenu((*reinterpret_cast< const QModelIndex(*)>(_a[1]))); break; + case 6: _t->OnSetParameterVisibility(); break; + case 7: _t->OnFilterTable((*reinterpret_cast< QString(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData BuiltinTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject BuiltinTable::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_BuiltinTable, + qt_meta_data_BuiltinTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &BuiltinTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *BuiltinTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *BuiltinTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_BuiltinTable)) + return static_cast(const_cast< BuiltinTable*>(this)); + return QWidget::qt_metacast(_clname); +} + +int BuiltinTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 8) + qt_static_metacall(this, _c, _id, _a); + _id -= 8; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_GenerationSettingsDialog.cpp b/src/moc_GenerationSettingsDialog.cpp new file mode 100644 index 000000000..0f4ee2617 --- /dev/null +++ b/src/moc_GenerationSettingsDialog.cpp @@ -0,0 +1,160 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'GenerationSettingsDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/GenerationSettingsDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'GenerationSettingsDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_GenerationSettingsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 27, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 26, 25, 25, 25, 0x09, + 35, 25, 25, 25, 0x09, + 44, 25, 25, 25, 0x09, + 53, 25, 25, 25, 0x09, + 70, 25, 25, 25, 0x09, + 88, 25, 25, 25, 0x09, + 105, 25, 25, 25, 0x09, + 125, 25, 25, 25, 0x09, + 142, 25, 25, 25, 0x09, + 157, 25, 25, 25, 0x09, + 173, 25, 25, 25, 0x09, + 188, 25, 25, 25, 0x09, + 206, 25, 25, 25, 0x09, + 221, 25, 25, 25, 0x09, + 248, 25, 25, 25, 0x09, + 275, 25, 25, 25, 0x09, + 301, 25, 25, 25, 0x09, + 327, 25, 25, 25, 0x09, + 349, 25, 25, 25, 0x09, + 371, 25, 25, 25, 0x09, + 394, 25, 25, 25, 0x09, + 417, 25, 25, 25, 0x09, + 439, 25, 25, 25, 0x09, + 461, 25, 25, 25, 0x09, + 486, 25, 25, 25, 0x09, + 511, 25, 25, 25, 0x09, + 533, 25, 25, 25, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_GenerationSettingsDialog[] = { + "GenerationSettingsDialog\0\0polish()\0" + "accept()\0reject()\0cpproot_browse()\0" + "javaroot_browse()\0phproot_browse()\0" + "pythonroot_browse()\0idlroot_browse()\0" + "cpp_relative()\0java_relative()\0" + "php_relative()\0python_relative()\0" + "idl_relative()\0java_get_visi_changed(int)\0" + "java_set_visi_changed(int)\0" + "php_get_visi_changed(int)\0" + "php_set_visi_changed(int)\0" + "follow_cpp_get_name()\0follow_cpp_set_name()\0" + "follow_java_get_name()\0follow_java_set_name()\0" + "follow_php_get_name()\0follow_php_set_name()\0" + "follow_python_get_name()\0" + "follow_python_set_name()\0follow_idl_get_name()\0" + "follow_idl_set_name()\0" +}; + +void GenerationSettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + GenerationSettingsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->reject(); break; + case 3: _t->cpproot_browse(); break; + case 4: _t->javaroot_browse(); break; + case 5: _t->phproot_browse(); break; + case 6: _t->pythonroot_browse(); break; + case 7: _t->idlroot_browse(); break; + case 8: _t->cpp_relative(); break; + case 9: _t->java_relative(); break; + case 10: _t->php_relative(); break; + case 11: _t->python_relative(); break; + case 12: _t->idl_relative(); break; + case 13: _t->java_get_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; + case 14: _t->java_set_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; + case 15: _t->php_get_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; + case 16: _t->php_set_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; + case 17: _t->follow_cpp_get_name(); break; + case 18: _t->follow_cpp_set_name(); break; + case 19: _t->follow_java_get_name(); break; + case 20: _t->follow_java_set_name(); break; + case 21: _t->follow_php_get_name(); break; + case 22: _t->follow_php_set_name(); break; + case 23: _t->follow_python_get_name(); break; + case 24: _t->follow_python_set_name(); break; + case 25: _t->follow_idl_get_name(); break; + case 26: _t->follow_idl_set_name(); break; + default: ; + } + } +} + +const QMetaObjectExtraData GenerationSettingsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject GenerationSettingsDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_GenerationSettingsDialog, + qt_meta_data_GenerationSettingsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &GenerationSettingsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *GenerationSettingsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *GenerationSettingsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_GenerationSettingsDialog)) + return static_cast(const_cast< GenerationSettingsDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int GenerationSettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 27) + qt_static_metacall(this, _c, _id, _a); + _id -= 27; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_GreetingsDialog.cpp b/src/moc_GreetingsDialog.cpp new file mode 100644 index 000000000..6a19922b6 --- /dev/null +++ b/src/moc_GreetingsDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'GreetingsDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/GreetingsDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'GreetingsDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_GreetingsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 17, 16, 16, 0x09, + 44, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_GreetingsDialog[] = { + "GreetingsDialog\0\0e\0closeEvent(QCloseEvent*)\0" + "valid_ok()\0" +}; + +void GreetingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + GreetingsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->closeEvent((*reinterpret_cast< QCloseEvent*(*)>(_a[1]))); break; + case 1: _t->valid_ok(); break; + default: ; + } + } +} + +const QMetaObjectExtraData GreetingsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject GreetingsDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_GreetingsDialog, + qt_meta_data_GreetingsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &GreetingsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *GreetingsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *GreetingsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_GreetingsDialog)) + return static_cast(const_cast< GreetingsDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int GreetingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_HelpDialog.cpp b/src/moc_HelpDialog.cpp new file mode 100644 index 000000000..4c471aa79 --- /dev/null +++ b/src/moc_HelpDialog.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'HelpDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/HelpDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'HelpDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_HelpDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_HelpDialog[] = { + "HelpDialog\0" +}; + +void HelpDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData HelpDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject HelpDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_HelpDialog, + qt_meta_data_HelpDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &HelpDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *HelpDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *HelpDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_HelpDialog)) + return static_cast(const_cast< HelpDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int HelpDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_HelpRegexpDialog.cpp b/src/moc_HelpRegexpDialog.cpp new file mode 100644 index 000000000..69a13dbb1 --- /dev/null +++ b/src/moc_HelpRegexpDialog.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'HelpRegexpDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/HelpRegexpDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'HelpRegexpDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_HelpRegexpDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_HelpRegexpDialog[] = { + "HelpRegexpDialog\0" +}; + +void HelpRegexpDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData HelpRegexpDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject HelpRegexpDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_HelpRegexpDialog, + qt_meta_data_HelpRegexpDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &HelpRegexpDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *HelpRegexpDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *HelpRegexpDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_HelpRegexpDialog)) + return static_cast(const_cast< HelpRegexpDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int HelpRegexpDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_HideShowDialog.cpp b/src/moc_HideShowDialog.cpp new file mode 100644 index 000000000..73ed02df1 --- /dev/null +++ b/src/moc_HideShowDialog.cpp @@ -0,0 +1,111 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'HideShowDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/HideShowDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'HideShowDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_HideShowDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 8, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 25, 15, 15, 15, 0x09, + 37, 15, 15, 15, 0x09, + 49, 15, 15, 15, 0x09, + 60, 15, 15, 15, 0x09, + 71, 15, 15, 15, 0x09, + 86, 15, 15, 15, 0x09, + 111, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_HideShowDialog[] = { + "HideShowDialog\0\0polish()\0hide_them()\0" + "show_them()\0show_all()\0hide_all()\0" + "hide_private()\0hide_private_protected()\0" + "accept()\0" +}; + +void HideShowDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + HideShowDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->hide_them(); break; + case 2: _t->show_them(); break; + case 3: _t->show_all(); break; + case 4: _t->hide_all(); break; + case 5: _t->hide_private(); break; + case 6: _t->hide_private_protected(); break; + case 7: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData HideShowDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject HideShowDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_HideShowDialog, + qt_meta_data_HideShowDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &HideShowDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *HideShowDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *HideShowDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_HideShowDialog)) + return static_cast(const_cast< HideShowDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int HideShowDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 8) + qt_static_metacall(this, _c, _id, _a); + _id -= 8; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_IconCanvas.cpp b/src/moc_IconCanvas.cpp new file mode 100644 index 000000000..d4fcf181a --- /dev/null +++ b/src/moc_IconCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'IconCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/IconCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'IconCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_IconCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_IconCanvas[] = { + "IconCanvas\0\0deleted()\0" +}; + +void IconCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + IconCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData IconCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject IconCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_IconCanvas, + qt_meta_data_IconCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &IconCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *IconCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *IconCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_IconCanvas)) + return static_cast(const_cast< IconCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< IconCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int IconCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ImageDialog.cpp b/src/moc_ImageDialog.cpp new file mode 100644 index 000000000..828463a34 --- /dev/null +++ b/src/moc_ImageDialog.cpp @@ -0,0 +1,101 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ImageDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ImageDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ImageDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ImageDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x09, + 22, 12, 12, 12, 0x09, + 31, 12, 12, 12, 0x09, + 47, 12, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ImageDialog[] = { + "ImageDialog\0\0accept()\0browse()\0" + "root_relative()\0prj_relative()\0" +}; + +void ImageDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ImageDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->accept(); break; + case 1: _t->browse(); break; + case 2: _t->root_relative(); break; + case 3: _t->prj_relative(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ImageDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ImageDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_ImageDialog, + qt_meta_data_ImageDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ImageDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ImageDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ImageDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ImageDialog)) + return static_cast(const_cast< ImageDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int ImageDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_InstanceDialog.cpp b/src/moc_InstanceDialog.cpp new file mode 100644 index 000000000..d92e57736 --- /dev/null +++ b/src/moc_InstanceDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'InstanceDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/InstanceDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'InstanceDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_InstanceDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 28, 15, 15, 15, 0x09, + 37, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_InstanceDialog[] = { + "InstanceDialog\0\0menu_type()\0polish()\0" + "accept()\0" +}; + +void InstanceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + InstanceDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->menu_type(); break; + case 1: _t->polish(); break; + case 2: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData InstanceDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject InstanceDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_InstanceDialog, + qt_meta_data_InstanceDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &InstanceDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *InstanceDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *InstanceDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_InstanceDialog)) + return static_cast(const_cast< InstanceDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int InstanceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_InterruptibleActivityRegionCanvas.cpp b/src/moc_InterruptibleActivityRegionCanvas.cpp new file mode 100644 index 000000000..0c23a5777 --- /dev/null +++ b/src/moc_InterruptibleActivityRegionCanvas.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'InterruptibleActivityRegionCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/InterruptibleActivityRegionCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'InterruptibleActivityRegionCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_InterruptibleActivityRegionCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 35, 34, 34, 34, 0x08, + 46, 34, 34, 34, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_InterruptibleActivityRegionCanvas[] = { + "InterruptibleActivityRegionCanvas\0\0" + "modified()\0deleted()\0" +}; + +void InterruptibleActivityRegionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + InterruptibleActivityRegionCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData InterruptibleActivityRegionCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject InterruptibleActivityRegionCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_InterruptibleActivityRegionCanvas, + qt_meta_data_InterruptibleActivityRegionCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &InterruptibleActivityRegionCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *InterruptibleActivityRegionCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *InterruptibleActivityRegionCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_InterruptibleActivityRegionCanvas)) + return static_cast(const_cast< InterruptibleActivityRegionCanvas*>(this)); + if (!strcmp(_clname, "ActivityContainerCanvas")) + return static_cast< ActivityContainerCanvas*>(const_cast< InterruptibleActivityRegionCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int InterruptibleActivityRegionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_MLEDialog.cpp b/src/moc_MLEDialog.cpp new file mode 100644 index 000000000..434f4fb9e --- /dev/null +++ b/src/moc_MLEDialog.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'MLEDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/MLEDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'MLEDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_MLEDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_MLEDialog[] = { + "MLEDialog\0" +}; + +void MLEDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData MLEDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject MLEDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_MLEDialog, + qt_meta_data_MLEDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &MLEDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *MLEDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *MLEDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_MLEDialog)) + return static_cast(const_cast< MLEDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int MLEDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_MultiPurposeDragArea.cpp b/src/moc_MultiPurposeDragArea.cpp new file mode 100644 index 000000000..cc9ce5000 --- /dev/null +++ b/src/moc_MultiPurposeDragArea.cpp @@ -0,0 +1,146 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'MultiPurposeDragArea.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "CustomWidgets/MultiPurposeDragArea.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'MultiPurposeDragArea.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_MultiPurposeDragArea[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 6, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 6, // signalCount + + // signals: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x05, + 43, 21, 21, 21, 0x05, + 66, 21, 21, 21, 0x05, + 78, 21, 21, 21, 0x05, + 88, 21, 21, 21, 0x05, + 111, 21, 21, 21, 0x05, + + 0 // eod +}; + +static const char qt_meta_stringdata_MultiPurposeDragArea[] = { + "MultiPurposeDragArea\0\0initiateMove(QPoint)\0" + "initiateResize(QPoint)\0endResize()\0" + "endMove()\0newCoordinates(QPoint)\0" + "changeTab(int)\0" +}; + +void MultiPurposeDragArea::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + MultiPurposeDragArea *_t = static_cast(_o); + switch (_id) { + case 0: _t->initiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 1: _t->initiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 2: _t->endResize(); break; + case 3: _t->endMove(); break; + case 4: _t->newCoordinates((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 5: _t->changeTab((*reinterpret_cast< int(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData MultiPurposeDragArea::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject MultiPurposeDragArea::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_MultiPurposeDragArea, + qt_meta_data_MultiPurposeDragArea, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &MultiPurposeDragArea::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *MultiPurposeDragArea::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *MultiPurposeDragArea::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_MultiPurposeDragArea)) + return static_cast(const_cast< MultiPurposeDragArea*>(this)); + return QWidget::qt_metacast(_clname); +} + +int MultiPurposeDragArea::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 6) + qt_static_metacall(this, _c, _id, _a); + _id -= 6; + } + return _id; +} + +// SIGNAL 0 +void MultiPurposeDragArea::initiateMove(QPoint _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} + +// SIGNAL 1 +void MultiPurposeDragArea::initiateResize(QPoint _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 1, _a); +} + +// SIGNAL 2 +void MultiPurposeDragArea::endResize() +{ + QMetaObject::activate(this, &staticMetaObject, 2, 0); +} + +// SIGNAL 3 +void MultiPurposeDragArea::endMove() +{ + QMetaObject::activate(this, &staticMetaObject, 3, 0); +} + +// SIGNAL 4 +void MultiPurposeDragArea::newCoordinates(QPoint _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 4, _a); +} + +// SIGNAL 5 +void MultiPurposeDragArea::changeTab(int _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 5, _a); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_MyInputDialog.cpp b/src/moc_MyInputDialog.cpp new file mode 100644 index 000000000..933055267 --- /dev/null +++ b/src/moc_MyInputDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'MyInputDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/MyInputDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'MyInputDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_MyInputDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x09, + 24, 14, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_MyInputDialog[] = { + "MyInputDialog\0\0polish()\0accept()\0" +}; + +void MyInputDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + MyInputDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData MyInputDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject MyInputDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_MyInputDialog, + qt_meta_data_MyInputDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &MyInputDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *MyInputDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *MyInputDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_MyInputDialog)) + return static_cast(const_cast< MyInputDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int MyInputDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_MyTable.cpp b/src/moc_MyTable.cpp new file mode 100644 index 000000000..8a55182b4 --- /dev/null +++ b/src/moc_MyTable.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'MyTable.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/MyTable.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'MyTable.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_MyTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_MyTable[] = { + "MyTable\0" +}; + +void MyTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData MyTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject MyTable::staticMetaObject = { + { &Q3Table::staticMetaObject, qt_meta_stringdata_MyTable, + qt_meta_data_MyTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &MyTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *MyTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *MyTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_MyTable)) + return static_cast(const_cast< MyTable*>(this)); + return Q3Table::qt_metacast(_clname); +} + +int MyTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3Table::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_NoteCanvas.cpp b/src/moc_NoteCanvas.cpp new file mode 100644 index 000000000..c0aa821d4 --- /dev/null +++ b/src/moc_NoteCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'NoteCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/NoteCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'NoteCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_NoteCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_NoteCanvas[] = { + "NoteCanvas\0\0modified()\0" +}; + +void NoteCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + NoteCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData NoteCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject NoteCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_NoteCanvas, + qt_meta_data_NoteCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &NoteCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *NoteCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *NoteCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_NoteCanvas)) + return static_cast(const_cast< NoteCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< NoteCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int NoteCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ObjectDiagramWindow.cpp b/src/moc_ObjectDiagramWindow.cpp new file mode 100644 index 000000000..34c6d57a0 --- /dev/null +++ b/src/moc_ObjectDiagramWindow.cpp @@ -0,0 +1,113 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ObjectDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ObjectDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ObjectDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ObjectDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 9, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 21, 20, 20, 20, 0x09, + 33, 20, 20, 20, 0x09, + 53, 20, 20, 20, 0x09, + 67, 20, 20, 20, 0x09, + 82, 20, 20, 20, 0x09, + 93, 20, 20, 20, 0x09, + 104, 20, 20, 20, 0x09, + 117, 20, 20, 20, 0x09, + 128, 20, 20, 20, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ObjectDiagramWindow[] = { + "ObjectDiagramWindow\0\0hit_class()\0" + "hit_classinstance()\0hit_package()\0" + "hit_fragment()\0hit_link()\0hit_note()\0" + "hit_anchor()\0hit_text()\0hit_image()\0" +}; + +void ObjectDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ObjectDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_class(); break; + case 1: _t->hit_classinstance(); break; + case 2: _t->hit_package(); break; + case 3: _t->hit_fragment(); break; + case 4: _t->hit_link(); break; + case 5: _t->hit_note(); break; + case 6: _t->hit_anchor(); break; + case 7: _t->hit_text(); break; + case 8: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ObjectDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ObjectDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ObjectDiagramWindow, + qt_meta_data_ObjectDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ObjectDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ObjectDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ObjectDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ObjectDiagramWindow)) + return static_cast(const_cast< ObjectDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int ObjectDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 9) + qt_static_metacall(this, _c, _id, _a); + _id -= 9; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ObjectLinkCanvas.cpp b/src/moc_ObjectLinkCanvas.cpp new file mode 100644 index 000000000..754c57915 --- /dev/null +++ b/src/moc_ObjectLinkCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ObjectLinkCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ObjectLinkCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ObjectLinkCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ObjectLinkCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x08, + 29, 17, 17, 17, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ObjectLinkCanvas[] = { + "ObjectLinkCanvas\0\0modified()\0deleted()\0" +}; + +void ObjectLinkCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ObjectLinkCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ObjectLinkCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ObjectLinkCanvas::staticMetaObject = { + { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_ObjectLinkCanvas, + qt_meta_data_ObjectLinkCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ObjectLinkCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ObjectLinkCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ObjectLinkCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ObjectLinkCanvas)) + return static_cast(const_cast< ObjectLinkCanvas*>(this)); + return ArrowCanvas::qt_metacast(_clname); +} + +int ObjectLinkCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ArrowCanvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ObjectLinkDialog.cpp b/src/moc_ObjectLinkDialog.cpp new file mode 100644 index 000000000..4ac99b710 --- /dev/null +++ b/src/moc_ObjectLinkDialog.cpp @@ -0,0 +1,101 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ObjectLinkDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ObjectLinkDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ObjectLinkDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ObjectLinkDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + 27, 17, 17, 17, 0x09, + 36, 17, 17, 17, 0x09, + 47, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ObjectLinkDialog[] = { + "ObjectLinkDialog\0\0polish()\0accept()\0" + "unselect()\0create()\0" +}; + +void ObjectLinkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ObjectLinkDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->unselect(); break; + case 3: _t->create(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ObjectLinkDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ObjectLinkDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_ObjectLinkDialog, + qt_meta_data_ObjectLinkDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ObjectLinkDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ObjectLinkDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ObjectLinkDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ObjectLinkDialog)) + return static_cast(const_cast< ObjectLinkDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int ObjectLinkDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_OdClassInstCanvas.cpp b/src/moc_OdClassInstCanvas.cpp new file mode 100644 index 000000000..eaee2ec38 --- /dev/null +++ b/src/moc_OdClassInstCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'OdClassInstCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/OdClassInstCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'OdClassInstCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_OdClassInstCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x08, + 30, 18, 18, 18, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_OdClassInstCanvas[] = { + "OdClassInstCanvas\0\0modified()\0deleted()\0" +}; + +void OdClassInstCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + OdClassInstCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData OdClassInstCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject OdClassInstCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_OdClassInstCanvas, + qt_meta_data_OdClassInstCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &OdClassInstCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *OdClassInstCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *OdClassInstCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_OdClassInstCanvas)) + return static_cast(const_cast< OdClassInstCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< OdClassInstCanvas*>(this)); + if (!strcmp(_clname, "ClassInstCanvas")) + return static_cast< ClassInstCanvas*>(const_cast< OdClassInstCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int OdClassInstCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_OperationData.cpp b/src/moc_OperationData.cpp new file mode 100644 index 000000000..3c67fbbcd --- /dev/null +++ b/src/moc_OperationData.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'OperationData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/OperationData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'OperationData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_OperationData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_OperationData[] = { + "OperationData\0\0on_delete()\0" +}; + +void OperationData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + OperationData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData OperationData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject OperationData::staticMetaObject = { + { &ClassMemberData::staticMetaObject, qt_meta_stringdata_OperationData, + qt_meta_data_OperationData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &OperationData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *OperationData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *OperationData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_OperationData)) + return static_cast(const_cast< OperationData*>(this)); + if (!strcmp(_clname, "Labeled")) + return static_cast< Labeled*>(const_cast< OperationData*>(this)); + if (!strcmp(_clname, "MultipleDependency")) + return static_cast< MultipleDependency*>(const_cast< OperationData*>(this)); + return ClassMemberData::qt_metacast(_clname); +} + +int OperationData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ClassMemberData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_OperationDialog.cpp b/src/moc_OperationDialog.cpp new file mode 100644 index 000000000..dffabe24b --- /dev/null +++ b/src/moc_OperationDialog.cpp @@ -0,0 +1,832 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'OperationDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/OperationDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'OperationDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_OperationDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 51, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + 35, 16, 16, 16, 0x09, + 57, 16, 16, 16, 0x09, + 76, 16, 16, 16, 0x09, + 97, 94, 16, 16, 0x09, + 121, 94, 16, 16, 0x09, + 144, 94, 16, 16, 0x09, + 171, 16, 16, 16, 0x09, + 190, 16, 16, 16, 0x09, + 210, 16, 16, 16, 0x09, + 230, 16, 16, 16, 0x09, + 248, 16, 16, 16, 0x09, + 270, 16, 16, 16, 0x09, + 290, 16, 16, 16, 0x09, + 308, 16, 16, 16, 0x09, + 327, 16, 16, 16, 0x09, + 344, 16, 16, 16, 0x09, + 365, 16, 16, 16, 0x09, + 381, 94, 16, 16, 0x09, + 410, 94, 16, 16, 0x09, + 431, 94, 16, 16, 0x09, + 453, 94, 16, 16, 0x09, + 474, 94, 16, 16, 0x09, + 494, 94, 16, 16, 0x09, + 515, 94, 16, 16, 0x09, + 538, 94, 16, 16, 0x09, + 560, 16, 16, 16, 0x09, + 579, 16, 16, 16, 0x09, + 599, 16, 16, 16, 0x09, + 617, 16, 16, 16, 0x09, + 634, 16, 16, 16, 0x09, + 657, 94, 16, 16, 0x09, + 694, 16, 16, 16, 0x09, + 712, 16, 16, 16, 0x09, + 731, 16, 16, 16, 0x09, + 748, 16, 16, 16, 0x09, + 764, 94, 16, 16, 0x09, + 788, 16, 16, 16, 0x09, + 805, 16, 16, 16, 0x09, + 826, 16, 16, 16, 0x09, + 848, 16, 16, 16, 0x09, + 868, 16, 16, 16, 0x09, + 887, 16, 16, 16, 0x09, + 907, 16, 16, 16, 0x09, + 931, 16, 16, 16, 0x09, + 949, 16, 16, 16, 0x09, + 968, 16, 16, 16, 0x09, + 986, 94, 16, 16, 0x09, + 1007, 16, 16, 16, 0x09, + 1033, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_OperationDialog[] = { + "OperationDialog\0\0polish()\0accept()\0" + "default_description()\0edit_description()\0" + "edit_constraint()\0on\0classoper_toggled(bool)\0" + "abstract_toggled(bool)\0" + "forcegenbody_toggled(bool)\0" + "cpp_default_decl()\0cpp_decl_from_def()\0" + "cpp_unmapped_decl()\0cpp_update_decl()\0" + "cpp_edit_param_decl()\0cpp_def_from_decl()\0" + "cpp_default_def()\0cpp_unmapped_def()\0" + "cpp_update_def()\0cpp_edit_param_def()\0" + "cpp_edit_body()\0const_volatile_toggled(bool)\0" + "friend_toggled(bool)\0virtual_toggled(bool)\0" + "inline_toggled(bool)\0final_toggled(bool)\0" + "delete_toggled(bool)\0override_toggled(bool)\0" + "default_toggled(bool)\0java_default_def()\0" + "java_unmapped_def()\0java_update_def()\0" + "java_edit_body()\0java_edit_annotation()\0" + "java_finalsynchronized_toggled(bool)\0" + "php_default_def()\0php_unmapped_def()\0" + "php_update_def()\0php_edit_body()\0" + "php_final_toggled(bool)\0php_edit_param()\0" + "python_default_def()\0python_unmapped_def()\0" + "python_update_def()\0python_edit_body()\0" + "python_edit_param()\0python_edit_decorator()\0" + "idl_default_def()\0idl_unmapped_def()\0" + "idl_update_decl()\0oneway_toggled(bool)\0" + "update_all_tabs(QWidget*)\0menu_returntype()\0" +}; + +void OperationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + OperationDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->default_description(); break; + case 3: _t->edit_description(); break; + case 4: _t->edit_constraint(); break; + case 5: _t->classoper_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 6: _t->abstract_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 7: _t->forcegenbody_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 8: _t->cpp_default_decl(); break; + case 9: _t->cpp_decl_from_def(); break; + case 10: _t->cpp_unmapped_decl(); break; + case 11: _t->cpp_update_decl(); break; + case 12: _t->cpp_edit_param_decl(); break; + case 13: _t->cpp_def_from_decl(); break; + case 14: _t->cpp_default_def(); break; + case 15: _t->cpp_unmapped_def(); break; + case 16: _t->cpp_update_def(); break; + case 17: _t->cpp_edit_param_def(); break; + case 18: _t->cpp_edit_body(); break; + case 19: _t->const_volatile_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 20: _t->friend_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 21: _t->virtual_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 22: _t->inline_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 23: _t->final_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 24: _t->delete_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 25: _t->override_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 26: _t->default_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 27: _t->java_default_def(); break; + case 28: _t->java_unmapped_def(); break; + case 29: _t->java_update_def(); break; + case 30: _t->java_edit_body(); break; + case 31: _t->java_edit_annotation(); break; + case 32: _t->java_finalsynchronized_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 33: _t->php_default_def(); break; + case 34: _t->php_unmapped_def(); break; + case 35: _t->php_update_def(); break; + case 36: _t->php_edit_body(); break; + case 37: _t->php_final_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 38: _t->php_edit_param(); break; + case 39: _t->python_default_def(); break; + case 40: _t->python_unmapped_def(); break; + case 41: _t->python_update_def(); break; + case 42: _t->python_edit_body(); break; + case 43: _t->python_edit_param(); break; + case 44: _t->python_edit_decorator(); break; + case 45: _t->idl_default_def(); break; + case 46: _t->idl_unmapped_def(); break; + case 47: _t->idl_update_decl(); break; + case 48: _t->oneway_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 49: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + case 50: _t->menu_returntype(); break; + default: ; + } + } +} + +const QMetaObjectExtraData OperationDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject OperationDialog::staticMetaObject = { + { &EdgeMenuDialog::staticMetaObject, qt_meta_stringdata_OperationDialog, + qt_meta_data_OperationDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &OperationDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *OperationDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *OperationDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_OperationDialog)) + return static_cast(const_cast< OperationDialog*>(this)); + return EdgeMenuDialog::qt_metacast(_clname); +} + +int OperationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = EdgeMenuDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 51) + qt_static_metacall(this, _c, _id, _a); + _id -= 51; + } + return _id; +} +static const uint qt_meta_data_ParamsTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 37, 13, 12, 12, 0x09, + 80, 72, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ParamsTable[] = { + "ParamsTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0value_changed(int,int)\0" +}; + +void ParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ParamsTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ParamsTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ParamsTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_ParamsTable, + qt_meta_data_ParamsTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ParamsTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ParamsTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ParamsTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ParamsTable)) + return static_cast(const_cast< ParamsTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int ParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_ExceptionsTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 41, 17, 16, 16, 0x09, + 84, 76, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ExceptionsTable[] = { + "ExceptionsTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0value_changed(int,int)\0" +}; + +void ExceptionsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ExceptionsTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ExceptionsTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ExceptionsTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_ExceptionsTable, + qt_meta_data_ExceptionsTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ExceptionsTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ExceptionsTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ExceptionsTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ExceptionsTable)) + return static_cast(const_cast< ExceptionsTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int ExceptionsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_CppParamsTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 40, 16, 15, 15, 0x09, + 83, 75, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_CppParamsTable[] = { + "CppParamsTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0setCurrentCell(int,int)\0" +}; + +void CppParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CppParamsTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->setCurrentCell((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData CppParamsTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CppParamsTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_CppParamsTable, + qt_meta_data_CppParamsTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CppParamsTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CppParamsTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CppParamsTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CppParamsTable)) + return static_cast(const_cast< CppParamsTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int CppParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_CppParamsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_CppParamsDialog[] = { + "CppParamsDialog\0\0polish()\0accept()\0" +}; + +void CppParamsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CppParamsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CppParamsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CppParamsDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_CppParamsDialog, + qt_meta_data_CppParamsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CppParamsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CppParamsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CppParamsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CppParamsDialog)) + return static_cast(const_cast< CppParamsDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int CppParamsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_PhpParamsTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 40, 16, 15, 15, 0x09, + 83, 75, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PhpParamsTable[] = { + "PhpParamsTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0setCurrentCell(int,int)\0" +}; + +void PhpParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PhpParamsTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->setCurrentCell((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData PhpParamsTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PhpParamsTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_PhpParamsTable, + qt_meta_data_PhpParamsTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PhpParamsTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PhpParamsTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PhpParamsTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PhpParamsTable)) + return static_cast(const_cast< PhpParamsTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int PhpParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_PhpParamsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PhpParamsDialog[] = { + "PhpParamsDialog\0\0polish()\0accept()\0" +}; + +void PhpParamsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PhpParamsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData PhpParamsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PhpParamsDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_PhpParamsDialog, + qt_meta_data_PhpParamsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PhpParamsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PhpParamsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PhpParamsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PhpParamsDialog)) + return static_cast(const_cast< PhpParamsDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int PhpParamsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_PythonParamsTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 43, 19, 18, 18, 0x09, + 86, 78, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PythonParamsTable[] = { + "PythonParamsTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0setCurrentCell(int,int)\0" +}; + +void PythonParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PythonParamsTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->setCurrentCell((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData PythonParamsTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PythonParamsTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_PythonParamsTable, + qt_meta_data_PythonParamsTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PythonParamsTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PythonParamsTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PythonParamsTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PythonParamsTable)) + return static_cast(const_cast< PythonParamsTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int PythonParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_PythonParamsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + 29, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PythonParamsDialog[] = { + "PythonParamsDialog\0\0polish()\0accept()\0" +}; + +void PythonParamsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PythonParamsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData PythonParamsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PythonParamsDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_PythonParamsDialog, + qt_meta_data_PythonParamsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PythonParamsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PythonParamsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PythonParamsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PythonParamsDialog)) + return static_cast(const_cast< PythonParamsDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int PythonParamsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_PackageCanvas.cpp b/src/moc_PackageCanvas.cpp new file mode 100644 index 000000000..f7d092564 --- /dev/null +++ b/src/moc_PackageCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PackageCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/PackageCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PackageCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_PackageCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x08, + 26, 14, 14, 14, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_PackageCanvas[] = { + "PackageCanvas\0\0modified()\0deleted()\0" +}; + +void PackageCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PackageCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData PackageCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PackageCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_PackageCanvas, + qt_meta_data_PackageCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PackageCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PackageCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PackageCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PackageCanvas)) + return static_cast(const_cast< PackageCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< PackageCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int PackageCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_PackageDialog.cpp b/src/moc_PackageDialog.cpp new file mode 100644 index 000000000..0df7ab225 --- /dev/null +++ b/src/moc_PackageDialog.cpp @@ -0,0 +1,132 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PackageDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/PackageDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PackageDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_PackageDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 17, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x09, + 24, 14, 14, 14, 0x09, + 33, 14, 14, 14, 0x09, + 52, 14, 14, 14, 0x09, + 83, 14, 14, 14, 0x09, + 99, 14, 14, 14, 0x09, + 113, 14, 14, 14, 0x09, + 127, 14, 14, 14, 0x09, + 140, 14, 14, 14, 0x09, + 156, 14, 14, 14, 0x09, + 169, 14, 14, 14, 0x09, + 187, 14, 14, 14, 0x09, + 203, 14, 14, 14, 0x09, + 219, 14, 14, 14, 0x09, + 234, 14, 14, 14, 0x09, + 252, 14, 14, 14, 0x09, + 267, 14, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PackageDialog[] = { + "PackageDialog\0\0polish()\0accept()\0" + "edit_description()\0edStereotypeActivated(QString)\0" + "cppsrc_browse()\0cpph_browse()\0" + "java_browse()\0php_browse()\0python_browse()\0" + "idl_browse()\0cppsrc_relative()\0" + "cpph_relative()\0java_relative()\0" + "php_relative()\0python_relative()\0" + "idl_relative()\0change_tabs(QWidget*)\0" +}; + +void PackageDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PackageDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->edStereotypeActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 4: _t->cppsrc_browse(); break; + case 5: _t->cpph_browse(); break; + case 6: _t->java_browse(); break; + case 7: _t->php_browse(); break; + case 8: _t->python_browse(); break; + case 9: _t->idl_browse(); break; + case 10: _t->cppsrc_relative(); break; + case 11: _t->cpph_relative(); break; + case 12: _t->java_relative(); break; + case 13: _t->php_relative(); break; + case 14: _t->python_relative(); break; + case 15: _t->idl_relative(); break; + case 16: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData PackageDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PackageDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_PackageDialog, + qt_meta_data_PackageDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PackageDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PackageDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PackageDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PackageDialog)) + return static_cast(const_cast< PackageDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int PackageDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 17) + qt_static_metacall(this, _c, _id, _a); + _id -= 17; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterCanvas.cpp b/src/moc_ParameterCanvas.cpp new file mode 100644 index 000000000..48e89c65b --- /dev/null +++ b/src/moc_ParameterCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ParameterCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ParameterCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ParameterCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ParameterCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x08, + 28, 16, 16, 16, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ParameterCanvas[] = { + "ParameterCanvas\0\0modified()\0deleted()\0" +}; + +void ParameterCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ParameterCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ParameterCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ParameterCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ParameterCanvas, + qt_meta_data_ParameterCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ParameterCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ParameterCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ParameterCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ParameterCanvas)) + return static_cast(const_cast< ParameterCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ParameterCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ParameterCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterData.cpp b/src/moc_ParameterData.cpp new file mode 100644 index 000000000..8fbc9c213 --- /dev/null +++ b/src/moc_ParameterData.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ParameterData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ParameterData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ParameterData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ParameterData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ParameterData[] = { + "ParameterData\0\0on_delete()\0" +}; + +void ParameterData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ParameterData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ParameterData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ParameterData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_ParameterData, + qt_meta_data_ParameterData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ParameterData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ParameterData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ParameterData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ParameterData)) + return static_cast(const_cast< ParameterData*>(this)); + if (!strcmp(_clname, "PinParamData")) + return static_cast< PinParamData*>(const_cast< ParameterData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int ParameterData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterDialog.cpp b/src/moc_ParameterDialog.cpp new file mode 100644 index 000000000..a69cd9d07 --- /dev/null +++ b/src/moc_ParameterDialog.cpp @@ -0,0 +1,113 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ParameterDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ParameterDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ParameterDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ParameterDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 9, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + 35, 16, 16, 16, 0x09, + 47, 16, 16, 16, 0x09, + 66, 16, 16, 16, 0x09, + 87, 16, 16, 16, 0x09, + 108, 16, 16, 16, 0x09, + 130, 16, 16, 16, 0x09, + 142, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ParameterDialog[] = { + "ParameterDialog\0\0polish()\0accept()\0" + "edit_init()\0edit_description()\0" + "edit_uml_selection()\0edit_cpp_selection()\0" + "edit_java_selection()\0menu_type()\0" + "change_tabs(QWidget*)\0" +}; + +void ParameterDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ParameterDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_init(); break; + case 3: _t->edit_description(); break; + case 4: _t->edit_uml_selection(); break; + case 5: _t->edit_cpp_selection(); break; + case 6: _t->edit_java_selection(); break; + case 7: _t->menu_type(); break; + case 8: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ParameterDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ParameterDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ParameterDialog, + qt_meta_data_ParameterDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ParameterDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ParameterDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ParameterDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ParameterDialog)) + return static_cast(const_cast< ParameterDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ParameterDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 9) + qt_static_metacall(this, _c, _id, _a); + _id -= 9; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterSetCanvas.cpp b/src/moc_ParameterSetCanvas.cpp new file mode 100644 index 000000000..2ad89ead0 --- /dev/null +++ b/src/moc_ParameterSetCanvas.cpp @@ -0,0 +1,101 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ParameterSetCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/ParameterSetCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ParameterSetCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ParameterSetCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x08, + 31, 19, 19, 19, 0x08, + 41, 19, 19, 19, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_ParameterSetCanvas[] = { + "ParameterSetCanvas\0\0modified()\0deleted()\0" + "pin_deleted()\0" +}; + +void ParameterSetCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ParameterSetCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + case 2: _t->pin_deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ParameterSetCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ParameterSetCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ParameterSetCanvas, + qt_meta_data_ParameterSetCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ParameterSetCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ParameterSetCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ParameterSetCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ParameterSetCanvas)) + return static_cast(const_cast< ParameterSetCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< ParameterSetCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int ParameterSetCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterSetData.cpp b/src/moc_ParameterSetData.cpp new file mode 100644 index 000000000..19c7744bc --- /dev/null +++ b/src/moc_ParameterSetData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ParameterSetData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/ParameterSetData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ParameterSetData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ParameterSetData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ParameterSetData[] = { + "ParameterSetData\0\0check()\0" +}; + +void ParameterSetData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ParameterSetData *_t = static_cast(_o); + switch (_id) { + case 0: _t->check(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ParameterSetData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ParameterSetData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_ParameterSetData, + qt_meta_data_ParameterSetData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ParameterSetData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ParameterSetData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ParameterSetData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ParameterSetData)) + return static_cast(const_cast< ParameterSetData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int ParameterSetData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterSetDialog.cpp b/src/moc_ParameterSetDialog.cpp new file mode 100644 index 000000000..cd7462b0a --- /dev/null +++ b/src/moc_ParameterSetDialog.cpp @@ -0,0 +1,105 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ParameterSetDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ParameterSetDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ParameterSetDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ParameterSetDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 6, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + 29, 19, 19, 19, 0x09, + 38, 19, 19, 19, 0x09, + 57, 19, 19, 19, 0x09, + 73, 19, 19, 19, 0x09, + 91, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ParameterSetDialog[] = { + "ParameterSetDialog\0\0polish()\0accept()\0" + "edit_description()\0associate_cls()\0" + "unassociate_cls()\0change_tabs(QWidget*)\0" +}; + +void ParameterSetDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ParameterSetDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->associate_cls(); break; + case 4: _t->unassociate_cls(); break; + case 5: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ParameterSetDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ParameterSetDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ParameterSetDialog, + qt_meta_data_ParameterSetDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ParameterSetDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ParameterSetDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ParameterSetDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ParameterSetDialog)) + return static_cast(const_cast< ParameterSetDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ParameterSetDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 6) + qt_static_metacall(this, _c, _id, _a); + _id -= 6; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_PinCanvas.cpp b/src/moc_PinCanvas.cpp new file mode 100644 index 000000000..3053e6280 --- /dev/null +++ b/src/moc_PinCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PinCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/PinCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PinCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_PinCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x08, + 22, 10, 10, 10, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_PinCanvas[] = { + "PinCanvas\0\0modified()\0deleted()\0" +}; + +void PinCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PinCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData PinCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PinCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_PinCanvas, + qt_meta_data_PinCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PinCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PinCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PinCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PinCanvas)) + return static_cast(const_cast< PinCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< PinCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int PinCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_PinDialog.cpp b/src/moc_PinDialog.cpp new file mode 100644 index 000000000..da6077960 --- /dev/null +++ b/src/moc_PinDialog.cpp @@ -0,0 +1,110 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PinDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/PinDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PinDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_PinDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 8, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x09, + 20, 10, 10, 10, 0x09, + 29, 10, 10, 10, 0x09, + 48, 10, 10, 10, 0x09, + 69, 10, 10, 10, 0x09, + 90, 10, 10, 10, 0x09, + 112, 10, 10, 10, 0x09, + 124, 10, 10, 10, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PinDialog[] = { + "PinDialog\0\0polish()\0accept()\0" + "edit_description()\0edit_uml_selection()\0" + "edit_cpp_selection()\0edit_java_selection()\0" + "menu_type()\0change_tabs(QWidget*)\0" +}; + +void PinDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PinDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->edit_uml_selection(); break; + case 4: _t->edit_cpp_selection(); break; + case 5: _t->edit_java_selection(); break; + case 6: _t->menu_type(); break; + case 7: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData PinDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PinDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_PinDialog, + qt_meta_data_PinDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PinDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PinDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PinDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PinDialog)) + return static_cast(const_cast< PinDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int PinDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 8) + qt_static_metacall(this, _c, _id, _a); + _id -= 8; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_PseudoStateCanvas.cpp b/src/moc_PseudoStateCanvas.cpp new file mode 100644 index 000000000..df34cd3b7 --- /dev/null +++ b/src/moc_PseudoStateCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PseudoStateCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/PseudoStateCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PseudoStateCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_PseudoStateCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x08, + 30, 18, 18, 18, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_PseudoStateCanvas[] = { + "PseudoStateCanvas\0\0modified()\0deleted()\0" +}; + +void PseudoStateCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PseudoStateCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData PseudoStateCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PseudoStateCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_PseudoStateCanvas, + qt_meta_data_PseudoStateCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PseudoStateCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PseudoStateCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PseudoStateCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PseudoStateCanvas)) + return static_cast(const_cast< PseudoStateCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< PseudoStateCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int PseudoStateCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_PseudoStateData.cpp b/src/moc_PseudoStateData.cpp new file mode 100644 index 000000000..8e325a9f4 --- /dev/null +++ b/src/moc_PseudoStateData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PseudoStateData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/PseudoStateData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PseudoStateData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_PseudoStateData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PseudoStateData[] = { + "PseudoStateData\0\0on_delete()\0" +}; + +void PseudoStateData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PseudoStateData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData PseudoStateData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PseudoStateData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_PseudoStateData, + qt_meta_data_PseudoStateData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PseudoStateData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PseudoStateData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PseudoStateData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PseudoStateData)) + return static_cast(const_cast< PseudoStateData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int PseudoStateData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_PseudoStateDialog.cpp b/src/moc_PseudoStateDialog.cpp new file mode 100644 index 000000000..abbbe79bf --- /dev/null +++ b/src/moc_PseudoStateDialog.cpp @@ -0,0 +1,101 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'PseudoStateDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/PseudoStateDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'PseudoStateDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_PseudoStateDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x09, + 28, 18, 18, 18, 0x09, + 37, 18, 18, 18, 0x09, + 54, 18, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_PseudoStateDialog[] = { + "PseudoStateDialog\0\0polish()\0accept()\0" + "menu_reference()\0edit_description()\0" +}; + +void PseudoStateDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + PseudoStateDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->menu_reference(); break; + case 3: _t->edit_description(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData PseudoStateDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject PseudoStateDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_PseudoStateDialog, + qt_meta_data_PseudoStateDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &PseudoStateDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *PseudoStateDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *PseudoStateDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_PseudoStateDialog)) + return static_cast(const_cast< PseudoStateDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int PseudoStateDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ReferenceDialog.cpp b/src/moc_ReferenceDialog.cpp new file mode 100644 index 000000000..a25ea32b5 --- /dev/null +++ b/src/moc_ReferenceDialog.cpp @@ -0,0 +1,107 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ReferenceDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ReferenceDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ReferenceDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ReferenceDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 7, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + 26, 16, 16, 16, 0x09, + 36, 16, 16, 16, 0x09, + 45, 16, 16, 16, 0x09, + 59, 16, 16, 16, 0x09, + 73, 16, 16, 16, 0x09, + 85, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ReferenceDialog[] = { + "ReferenceDialog\0\0polish()\0compute()\0" + "select()\0selected(int)\0mark_unmark()\0" + "mark_them()\0unmark_all()\0" +}; + +void ReferenceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ReferenceDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->compute(); break; + case 2: _t->select(); break; + case 3: _t->selected((*reinterpret_cast< int(*)>(_a[1]))); break; + case 4: _t->mark_unmark(); break; + case 5: _t->mark_them(); break; + case 6: _t->unmark_all(); break; + default: ; + } + } +} + +const QMetaObjectExtraData ReferenceDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ReferenceDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_ReferenceDialog, + qt_meta_data_ReferenceDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ReferenceDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ReferenceDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ReferenceDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ReferenceDialog)) + return static_cast(const_cast< ReferenceDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int ReferenceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 7) + qt_static_metacall(this, _c, _id, _a); + _id -= 7; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_RelatedElementsDialog.cpp b/src/moc_RelatedElementsDialog.cpp new file mode 100644 index 000000000..36a28a89f --- /dev/null +++ b/src/moc_RelatedElementsDialog.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'RelatedElementsDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/RelatedElementsDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'RelatedElementsDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_RelatedElementsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 23, 22, 22, 22, 0x09, + 32, 22, 22, 22, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_RelatedElementsDialog[] = { + "RelatedElementsDialog\0\0polish()\0" + "accept()\0" +}; + +void RelatedElementsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + RelatedElementsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData RelatedElementsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject RelatedElementsDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_RelatedElementsDialog, + qt_meta_data_RelatedElementsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &RelatedElementsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *RelatedElementsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *RelatedElementsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_RelatedElementsDialog)) + return static_cast(const_cast< RelatedElementsDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int RelatedElementsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_RelationCanvas.cpp b/src/moc_RelationCanvas.cpp new file mode 100644 index 000000000..1f0a5286d --- /dev/null +++ b/src/moc_RelationCanvas.cpp @@ -0,0 +1,102 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'RelationCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/RelationCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'RelationCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_RelationCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x08, + 27, 15, 15, 15, 0x08, + 46, 15, 15, 15, 0x08, + 56, 15, 15, 15, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_RelationCanvas[] = { + "RelationCanvas\0\0modified()\0" + "actuals_modified()\0deleted()\0" + "drawing_settings_modified()\0" +}; + +void RelationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + RelationCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->actuals_modified(); break; + case 2: _t->deleted(); break; + case 3: _t->drawing_settings_modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData RelationCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject RelationCanvas::staticMetaObject = { + { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_RelationCanvas, + qt_meta_data_RelationCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &RelationCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *RelationCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *RelationCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_RelationCanvas)) + return static_cast(const_cast< RelationCanvas*>(this)); + return ArrowCanvas::qt_metacast(_clname); +} + +int RelationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ArrowCanvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_RelationData.cpp b/src/moc_RelationData.cpp new file mode 100644 index 000000000..42adb40c1 --- /dev/null +++ b/src/moc_RelationData.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'RelationData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/RelationData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'RelationData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_RelationData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x09, + 28, 13, 13, 13, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_RelationData[] = { + "RelationData\0\0end_deleted()\0on_delete()\0" +}; + +void RelationData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + RelationData *_t = static_cast(_o); + switch (_id) { + case 0: _t->end_deleted(); break; + case 1: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData RelationData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject RelationData::staticMetaObject = { + { &ClassMemberData::staticMetaObject, qt_meta_stringdata_RelationData, + qt_meta_data_RelationData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &RelationData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *RelationData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *RelationData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_RelationData)) + return static_cast(const_cast< RelationData*>(this)); + if (!strcmp(_clname, "Labeled")) + return static_cast< Labeled*>(const_cast< RelationData*>(this)); + return ClassMemberData::qt_metacast(_clname); +} + +int RelationData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ClassMemberData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_RelationDialog.cpp b/src/moc_RelationDialog.cpp new file mode 100644 index 000000000..e2579fe9c --- /dev/null +++ b/src/moc_RelationDialog.cpp @@ -0,0 +1,210 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'RelationDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/RelationDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'RelationDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_RelationDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 48, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 25, 15, 15, 15, 0x09, + 34, 15, 15, 15, 0x09, + 58, 15, 15, 15, 0x09, + 82, 15, 15, 15, 0x09, + 103, 15, 15, 15, 0x09, + 124, 15, 15, 15, 0x09, + 144, 15, 15, 15, 0x09, + 164, 15, 15, 15, 0x09, + 178, 15, 15, 15, 0x09, + 192, 15, 15, 15, 0x09, + 213, 15, 15, 15, 0x09, + 226, 15, 15, 15, 0x09, + 250, 15, 15, 15, 0x09, + 274, 15, 15, 15, 0x09, + 289, 15, 15, 15, 0x09, + 304, 15, 15, 15, 0x09, + 320, 15, 15, 15, 0x09, + 344, 15, 15, 15, 0x09, + 361, 15, 15, 15, 0x09, + 377, 15, 15, 15, 0x09, + 394, 15, 15, 15, 0x09, + 410, 15, 15, 15, 0x09, + 426, 15, 15, 15, 0x09, + 443, 15, 15, 15, 0x09, + 461, 15, 15, 15, 0x09, + 478, 15, 15, 15, 0x09, + 496, 15, 15, 15, 0x09, + 521, 15, 15, 15, 0x09, + 546, 15, 15, 15, 0x09, + 561, 15, 15, 15, 0x09, + 576, 15, 15, 15, 0x09, + 592, 15, 15, 15, 0x09, + 609, 15, 15, 15, 0x09, + 625, 15, 15, 15, 0x09, + 642, 15, 15, 15, 0x09, + 660, 15, 15, 15, 0x09, + 678, 15, 15, 15, 0x09, + 697, 15, 15, 15, 0x09, + 717, 15, 15, 15, 0x09, + 736, 15, 15, 15, 0x09, + 756, 15, 15, 15, 0x09, + 771, 15, 15, 15, 0x09, + 786, 15, 15, 15, 0x09, + 802, 15, 15, 15, 0x09, + 819, 15, 15, 15, 0x09, + 835, 15, 15, 15, 0x09, + 852, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_RelationDialog[] = { + "RelationDialog\0\0polish()\0accept()\0" + "default_description_a()\0default_description_b()\0" + "edit_description_a()\0edit_description_b()\0" + "edit_constraint_a()\0edit_constraint_b()\0" + "edit_init_a()\0edit_init_b()\0" + "edTypeActivated(int)\0menu_assoc()\0" + "derived_changed_a(bool)\0derived_changed_b(bool)\0" + "cpp_update_a()\0cpp_update_b()\0" + "cpp_default_a()\0cpp_include_in_header()\0" + "cpp_unmapped_a()\0cpp_default_b()\0" + "cpp_unmapped_b()\0java_update_a()\0" + "java_update_b()\0java_default_a()\0" + "java_unmapped_a()\0java_default_b()\0" + "java_unmapped_b()\0java_edit_annotation_a()\0" + "java_edit_annotation_b()\0php_update_a()\0" + "php_update_b()\0php_default_a()\0" + "php_unmapped_a()\0php_default_b()\0" + "php_unmapped_b()\0python_update_a()\0" + "python_update_b()\0python_default_a()\0" + "python_unmapped_a()\0python_default_b()\0" + "python_unmapped_b()\0idl_update_a()\0" + "idl_update_b()\0idl_default_a()\0" + "idl_unmapped_a()\0idl_default_b()\0" + "idl_unmapped_b()\0update_all_tabs(QWidget*)\0" +}; + +void RelationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + RelationDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->default_description_a(); break; + case 3: _t->default_description_b(); break; + case 4: _t->edit_description_a(); break; + case 5: _t->edit_description_b(); break; + case 6: _t->edit_constraint_a(); break; + case 7: _t->edit_constraint_b(); break; + case 8: _t->edit_init_a(); break; + case 9: _t->edit_init_b(); break; + case 10: _t->edTypeActivated((*reinterpret_cast< int(*)>(_a[1]))); break; + case 11: _t->menu_assoc(); break; + case 12: _t->derived_changed_a((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 13: _t->derived_changed_b((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 14: _t->cpp_update_a(); break; + case 15: _t->cpp_update_b(); break; + case 16: _t->cpp_default_a(); break; + case 17: _t->cpp_include_in_header(); break; + case 18: _t->cpp_unmapped_a(); break; + case 19: _t->cpp_default_b(); break; + case 20: _t->cpp_unmapped_b(); break; + case 21: _t->java_update_a(); break; + case 22: _t->java_update_b(); break; + case 23: _t->java_default_a(); break; + case 24: _t->java_unmapped_a(); break; + case 25: _t->java_default_b(); break; + case 26: _t->java_unmapped_b(); break; + case 27: _t->java_edit_annotation_a(); break; + case 28: _t->java_edit_annotation_b(); break; + case 29: _t->php_update_a(); break; + case 30: _t->php_update_b(); break; + case 31: _t->php_default_a(); break; + case 32: _t->php_unmapped_a(); break; + case 33: _t->php_default_b(); break; + case 34: _t->php_unmapped_b(); break; + case 35: _t->python_update_a(); break; + case 36: _t->python_update_b(); break; + case 37: _t->python_default_a(); break; + case 38: _t->python_unmapped_a(); break; + case 39: _t->python_default_b(); break; + case 40: _t->python_unmapped_b(); break; + case 41: _t->idl_update_a(); break; + case 42: _t->idl_update_b(); break; + case 43: _t->idl_default_a(); break; + case 44: _t->idl_unmapped_a(); break; + case 45: _t->idl_default_b(); break; + case 46: _t->idl_unmapped_b(); break; + case 47: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData RelationDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject RelationDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_RelationDialog, + qt_meta_data_RelationDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &RelationDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *RelationDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *RelationDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_RelationDialog)) + return static_cast(const_cast< RelationDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int RelationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 48) + qt_static_metacall(this, _c, _id, _a); + _id -= 48; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_RevSettingsDialog.cpp b/src/moc_RevSettingsDialog.cpp new file mode 100644 index 000000000..5be8506b8 --- /dev/null +++ b/src/moc_RevSettingsDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'RevSettingsDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/RevSettingsDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'RevSettingsDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_RevSettingsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x09, + 28, 18, 18, 18, 0x09, + 37, 18, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_RevSettingsDialog[] = { + "RevSettingsDialog\0\0polish()\0accept()\0" + "show_regexp_help()\0" +}; + +void RevSettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + RevSettingsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->show_regexp_help(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData RevSettingsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject RevSettingsDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_RevSettingsDialog, + qt_meta_data_RevSettingsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &RevSettingsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *RevSettingsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *RevSettingsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_RevSettingsDialog)) + return static_cast(const_cast< RevSettingsDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int RevSettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SdClassInstCanvas.cpp b/src/moc_SdClassInstCanvas.cpp new file mode 100644 index 000000000..cf7b53521 --- /dev/null +++ b/src/moc_SdClassInstCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SdClassInstCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/SdClassInstCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SdClassInstCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SdClassInstCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x08, + 30, 18, 18, 18, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_SdClassInstCanvas[] = { + "SdClassInstCanvas\0\0modified()\0deleted()\0" +}; + +void SdClassInstCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SdClassInstCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SdClassInstCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SdClassInstCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_SdClassInstCanvas, + qt_meta_data_SdClassInstCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SdClassInstCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SdClassInstCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SdClassInstCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SdClassInstCanvas)) + return static_cast(const_cast< SdClassInstCanvas*>(this)); + if (!strcmp(_clname, "SdObjCanvas")) + return static_cast< SdObjCanvas*>(const_cast< SdClassInstCanvas*>(this)); + if (!strcmp(_clname, "ClassInstCanvas")) + return static_cast< ClassInstCanvas*>(const_cast< SdClassInstCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int SdClassInstCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SdContinuationCanvas.cpp b/src/moc_SdContinuationCanvas.cpp new file mode 100644 index 000000000..60e72b728 --- /dev/null +++ b/src/moc_SdContinuationCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SdContinuationCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/SdContinuationCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SdContinuationCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SdContinuationCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_SdContinuationCanvas[] = { + "SdContinuationCanvas\0\0modified()\0" +}; + +void SdContinuationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SdContinuationCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SdContinuationCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SdContinuationCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_SdContinuationCanvas, + qt_meta_data_SdContinuationCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SdContinuationCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SdContinuationCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SdContinuationCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SdContinuationCanvas)) + return static_cast(const_cast< SdContinuationCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< SdContinuationCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int SdContinuationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SdDurationCanvas.cpp b/src/moc_SdDurationCanvas.cpp new file mode 100644 index 000000000..c31277527 --- /dev/null +++ b/src/moc_SdDurationCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SdDurationCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/SdDurationCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SdDurationCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SdDurationCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_SdDurationCanvas[] = { + "SdDurationCanvas\0\0modified()\0" +}; + +void SdDurationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SdDurationCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SdDurationCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SdDurationCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_SdDurationCanvas, + qt_meta_data_SdDurationCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SdDurationCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SdDurationCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SdDurationCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SdDurationCanvas)) + return static_cast(const_cast< SdDurationCanvas*>(this)); + if (!strcmp(_clname, "SdMsgSupport")) + return static_cast< SdMsgSupport*>(const_cast< SdDurationCanvas*>(this)); + if (!strcmp(_clname, "SdDurationSupport")) + return static_cast< SdDurationSupport*>(const_cast< SdDurationCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int SdDurationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SdMsgBaseCanvas.cpp b/src/moc_SdMsgBaseCanvas.cpp new file mode 100644 index 000000000..52a26b1b2 --- /dev/null +++ b/src/moc_SdMsgBaseCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SdMsgBaseCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/SdMsgBaseCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SdMsgBaseCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SdMsgBaseCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_SdMsgBaseCanvas[] = { + "SdMsgBaseCanvas\0\0modified()\0" +}; + +void SdMsgBaseCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SdMsgBaseCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SdMsgBaseCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SdMsgBaseCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_SdMsgBaseCanvas, + qt_meta_data_SdMsgBaseCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SdMsgBaseCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SdMsgBaseCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SdMsgBaseCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SdMsgBaseCanvas)) + return static_cast(const_cast< SdMsgBaseCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< SdMsgBaseCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int SdMsgBaseCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SdMsgDialog.cpp b/src/moc_SdMsgDialog.cpp new file mode 100644 index 000000000..0f632b427 --- /dev/null +++ b/src/moc_SdMsgDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SdMsgDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/SdMsgDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SdMsgDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SdMsgDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x09, + 23, 12, 12, 12, 0x09, + 32, 12, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_SdMsgDialog[] = { + "SdMsgDialog\0\0menu_op()\0polish()\0" + "accept()\0" +}; + +void SdMsgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SdMsgDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->menu_op(); break; + case 1: _t->polish(); break; + case 2: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SdMsgDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SdMsgDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_SdMsgDialog, + qt_meta_data_SdMsgDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SdMsgDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SdMsgDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SdMsgDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SdMsgDialog)) + return static_cast(const_cast< SdMsgDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int SdMsgDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SeqDiagramWindow.cpp b/src/moc_SeqDiagramWindow.cpp new file mode 100644 index 000000000..b37733619 --- /dev/null +++ b/src/moc_SeqDiagramWindow.cpp @@ -0,0 +1,136 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SeqDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/SeqDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SeqDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SeqDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 18, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + 30, 17, 17, 17, 0x09, + 50, 17, 17, 17, 0x09, + 69, 17, 17, 17, 0x09, + 84, 17, 17, 17, 0x09, + 98, 17, 17, 17, 0x09, + 113, 17, 17, 17, 0x09, + 132, 17, 17, 17, 0x09, + 152, 17, 17, 17, 0x09, + 170, 17, 17, 17, 0x09, + 189, 17, 17, 17, 0x09, + 207, 17, 17, 17, 0x09, + 226, 17, 17, 17, 0x09, + 242, 17, 17, 17, 0x09, + 262, 17, 17, 17, 0x09, + 273, 17, 17, 17, 0x09, + 286, 17, 17, 17, 0x09, + 297, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_SeqDiagramWindow[] = { + "SeqDiagramWindow\0\0hit_class()\0" + "hit_classinstance()\0hit_continuation()\0" + "hit_fragment()\0hit_syncmsg()\0" + "hit_asyncmsg()\0hit_foundsyncmsg()\0" + "hit_foundasyncmsg()\0hit_lostsyncmsg()\0" + "hit_lostasyncmsg()\0hit_syncselfmsg()\0" + "hit_asyncselfmsg()\0hit_returnmsg()\0" + "hit_selfreturnmsg()\0hit_note()\0" + "hit_anchor()\0hit_text()\0hit_image()\0" +}; + +void SeqDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SeqDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_class(); break; + case 1: _t->hit_classinstance(); break; + case 2: _t->hit_continuation(); break; + case 3: _t->hit_fragment(); break; + case 4: _t->hit_syncmsg(); break; + case 5: _t->hit_asyncmsg(); break; + case 6: _t->hit_foundsyncmsg(); break; + case 7: _t->hit_foundasyncmsg(); break; + case 8: _t->hit_lostsyncmsg(); break; + case 9: _t->hit_lostasyncmsg(); break; + case 10: _t->hit_syncselfmsg(); break; + case 11: _t->hit_asyncselfmsg(); break; + case 12: _t->hit_returnmsg(); break; + case 13: _t->hit_selfreturnmsg(); break; + case 14: _t->hit_note(); break; + case 15: _t->hit_anchor(); break; + case 16: _t->hit_text(); break; + case 17: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SeqDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SeqDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_SeqDiagramWindow, + qt_meta_data_SeqDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SeqDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SeqDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SeqDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SeqDiagramWindow)) + return static_cast(const_cast< SeqDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int SeqDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 18) + qt_static_metacall(this, _c, _id, _a); + _id -= 18; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_Settings.cpp b/src/moc_Settings.cpp new file mode 100644 index 000000000..1fece8d50 --- /dev/null +++ b/src/moc_Settings.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'Settings.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "misc/Settings.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'Settings.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_DrawingSettings[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x05, + + 0 // eod +}; + +static const char qt_meta_stringdata_DrawingSettings[] = { + "DrawingSettings\0\0changed()\0" +}; + +void DrawingSettings::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + DrawingSettings *_t = static_cast(_o); + switch (_id) { + case 0: _t->changed(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData DrawingSettings::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject DrawingSettings::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_DrawingSettings, + qt_meta_data_DrawingSettings, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &DrawingSettings::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *DrawingSettings::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *DrawingSettings::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_DrawingSettings)) + return static_cast(const_cast< DrawingSettings*>(this)); + return QObject::qt_metacast(_clname); +} + +int DrawingSettings::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} + +// SIGNAL 0 +void DrawingSettings::changed() +{ + QMetaObject::activate(this, &staticMetaObject, 0, 0); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SettingsDialog.cpp b/src/moc_SettingsDialog.cpp new file mode 100644 index 000000000..2b3931def --- /dev/null +++ b/src/moc_SettingsDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SettingsDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/SettingsDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SettingsDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SettingsDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 25, 15, 15, 15, 0x09, + 34, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_SettingsDialog[] = { + "SettingsDialog\0\0polish()\0accept()\0" + "apply()\0" +}; + +void SettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SettingsDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->apply(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SettingsDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SettingsDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_SettingsDialog, + qt_meta_data_SettingsDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SettingsDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SettingsDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SettingsDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SettingsDialog)) + return static_cast(const_cast< SettingsDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int SettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ShortcutDialog.cpp b/src/moc_ShortcutDialog.cpp new file mode 100644 index 000000000..25516a27d --- /dev/null +++ b/src/moc_ShortcutDialog.cpp @@ -0,0 +1,173 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ShortcutDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ShortcutDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ShortcutDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ShortcutDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + 25, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ShortcutDialog[] = { + "ShortcutDialog\0\0polish()\0accept()\0" +}; + +void ShortcutDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ShortcutDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ShortcutDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ShortcutDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ShortcutDialog, + qt_meta_data_ShortcutDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ShortcutDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ShortcutDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ShortcutDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ShortcutDialog)) + return static_cast(const_cast< ShortcutDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ShortcutDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_ShortcutTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 39, 15, 14, 14, 0x09, + 82, 74, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ShortcutTable[] = { + "ShortcutTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0value_changed(int,int)\0" +}; + +void ShortcutTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ShortcutTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ShortcutTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ShortcutTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_ShortcutTable, + qt_meta_data_ShortcutTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ShortcutTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ShortcutTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ShortcutTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ShortcutTable)) + return static_cast(const_cast< ShortcutTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int ShortcutTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleData.cpp b/src/moc_SimpleData.cpp new file mode 100644 index 000000000..24b2e5c5f --- /dev/null +++ b/src/moc_SimpleData.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SimpleData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/SimpleData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SimpleData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SimpleData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_SimpleData[] = { + "SimpleData\0" +}; + +void SimpleData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SimpleData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SimpleData::staticMetaObject = { + { &BasicData::staticMetaObject, qt_meta_stringdata_SimpleData, + qt_meta_data_SimpleData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SimpleData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SimpleData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SimpleData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SimpleData)) + return static_cast(const_cast< SimpleData*>(this)); + return BasicData::qt_metacast(_clname); +} + +int SimpleData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = BasicData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleRelationCanvas.cpp b/src/moc_SimpleRelationCanvas.cpp new file mode 100644 index 000000000..8dade07e3 --- /dev/null +++ b/src/moc_SimpleRelationCanvas.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SimpleRelationCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/SimpleRelationCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SimpleRelationCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SimpleRelationCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x08, + 33, 21, 21, 21, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_SimpleRelationCanvas[] = { + "SimpleRelationCanvas\0\0modified()\0" + "deleted()\0" +}; + +void SimpleRelationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SimpleRelationCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SimpleRelationCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SimpleRelationCanvas::staticMetaObject = { + { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_SimpleRelationCanvas, + qt_meta_data_SimpleRelationCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SimpleRelationCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SimpleRelationCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SimpleRelationCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SimpleRelationCanvas)) + return static_cast(const_cast< SimpleRelationCanvas*>(this)); + return ArrowCanvas::qt_metacast(_clname); +} + +int SimpleRelationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ArrowCanvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleRelationData.cpp b/src/moc_SimpleRelationData.cpp new file mode 100644 index 000000000..b026cc4d5 --- /dev/null +++ b/src/moc_SimpleRelationData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SimpleRelationData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/SimpleRelationData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SimpleRelationData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SimpleRelationData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_SimpleRelationData[] = { + "SimpleRelationData\0\0end_deleted()\0" +}; + +void SimpleRelationData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SimpleRelationData *_t = static_cast(_o); + switch (_id) { + case 0: _t->end_deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SimpleRelationData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SimpleRelationData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_SimpleRelationData, + qt_meta_data_SimpleRelationData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SimpleRelationData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SimpleRelationData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SimpleRelationData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SimpleRelationData)) + return static_cast(const_cast< SimpleRelationData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int SimpleRelationData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleRelationDialog.cpp b/src/moc_SimpleRelationDialog.cpp new file mode 100644 index 000000000..18e47216d --- /dev/null +++ b/src/moc_SimpleRelationDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SimpleRelationDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/SimpleRelationDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SimpleRelationDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SimpleRelationDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x09, + 31, 21, 21, 21, 0x09, + 40, 21, 21, 21, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_SimpleRelationDialog[] = { + "SimpleRelationDialog\0\0polish()\0accept()\0" + "edit_description()\0" +}; + +void SimpleRelationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SimpleRelationDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SimpleRelationDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SimpleRelationDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_SimpleRelationDialog, + qt_meta_data_SimpleRelationDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SimpleRelationDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SimpleRelationDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SimpleRelationDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SimpleRelationDialog)) + return static_cast(const_cast< SimpleRelationDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int SimpleRelationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_Socket.cpp b/src/moc_Socket.cpp new file mode 100644 index 000000000..e863c1b5b --- /dev/null +++ b/src/moc_Socket.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'Socket.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "tool/Socket.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'Socket.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_Socket[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 8, 7, 7, 7, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_Socket[] = { + "Socket\0\0data_received()\0" +}; + +void Socket::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + Socket *_t = static_cast(_o); + switch (_id) { + case 0: _t->data_received(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData Socket::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject Socket::staticMetaObject = { + { &Q3SocketDevice::staticMetaObject, qt_meta_stringdata_Socket, + qt_meta_data_Socket, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &Socket::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *Socket::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *Socket::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_Socket)) + return static_cast(const_cast< Socket*>(this)); + return Q3SocketDevice::qt_metacast(_clname); +} + +int Socket::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3SocketDevice::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SourceDialog.cpp b/src/moc_SourceDialog.cpp new file mode 100644 index 000000000..70aaafede --- /dev/null +++ b/src/moc_SourceDialog.cpp @@ -0,0 +1,177 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SourceDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/SourceDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SourceDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_NumberedMultiLineEdit[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 27, 23, 22, 22, 0x05, + + 0 // eod +}; + +static const char qt_meta_stringdata_NumberedMultiLineEdit[] = { + "NumberedMultiLineEdit\0\0l,c\0" + "cursorMoved(int,int)\0" +}; + +void NumberedMultiLineEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + NumberedMultiLineEdit *_t = static_cast(_o); + switch (_id) { + case 0: _t->cursorMoved((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData NumberedMultiLineEdit::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject NumberedMultiLineEdit::staticMetaObject = { + { &MultiLineEdit::staticMetaObject, qt_meta_stringdata_NumberedMultiLineEdit, + qt_meta_data_NumberedMultiLineEdit, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &NumberedMultiLineEdit::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *NumberedMultiLineEdit::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *NumberedMultiLineEdit::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_NumberedMultiLineEdit)) + return static_cast(const_cast< NumberedMultiLineEdit*>(this)); + return MultiLineEdit::qt_metacast(_clname); +} + +int NumberedMultiLineEdit::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MultiLineEdit::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} + +// SIGNAL 0 +void NumberedMultiLineEdit::cursorMoved(int _t1, int _t2) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)), const_cast(reinterpret_cast(&_t2)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} +static const uint qt_meta_data_SourceDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x09, + 25, 21, 13, 13, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_SourceDialog[] = { + "SourceDialog\0\0edit()\0l,c\0" + "updateCursorPos(int,int)\0" +}; + +void SourceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SourceDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->edit(); break; + case 1: _t->updateCursorPos((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData SourceDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SourceDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_SourceDialog, + qt_meta_data_SourceDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SourceDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SourceDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SourceDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SourceDialog)) + return static_cast(const_cast< SourceDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int SourceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StateActionCanvas.cpp b/src/moc_StateActionCanvas.cpp new file mode 100644 index 000000000..c73e1b169 --- /dev/null +++ b/src/moc_StateActionCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StateActionCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/StateActionCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StateActionCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StateActionCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x08, + 30, 18, 18, 18, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_StateActionCanvas[] = { + "StateActionCanvas\0\0modified()\0deleted()\0" +}; + +void StateActionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StateActionCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StateActionCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StateActionCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_StateActionCanvas, + qt_meta_data_StateActionCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StateActionCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StateActionCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StateActionCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StateActionCanvas)) + return static_cast(const_cast< StateActionCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< StateActionCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int StateActionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StateActionDialog.cpp b/src/moc_StateActionDialog.cpp new file mode 100644 index 000000000..34c2afd21 --- /dev/null +++ b/src/moc_StateActionDialog.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StateActionDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/StateActionDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StateActionDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StateActionDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 4, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x09, + 28, 18, 18, 18, 0x09, + 37, 18, 18, 18, 0x09, + 56, 18, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_StateActionDialog[] = { + "StateActionDialog\0\0polish()\0accept()\0" + "edit_description()\0change_tabs(QWidget*)\0" +}; + +void StateActionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StateActionDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData StateActionDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StateActionDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_StateActionDialog, + qt_meta_data_StateActionDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StateActionDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StateActionDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StateActionDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StateActionDialog)) + return static_cast(const_cast< StateActionDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int StateActionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 4) + qt_static_metacall(this, _c, _id, _a); + _id -= 4; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StateCanvas.cpp b/src/moc_StateCanvas.cpp new file mode 100644 index 000000000..1b016ea69 --- /dev/null +++ b/src/moc_StateCanvas.cpp @@ -0,0 +1,100 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StateCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/StateCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StateCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StateCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x08, + 24, 12, 12, 12, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_StateCanvas[] = { + "StateCanvas\0\0modified()\0deleted()\0" +}; + +void StateCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StateCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StateCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StateCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_StateCanvas, + qt_meta_data_StateCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StateCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StateCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StateCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StateCanvas)) + return static_cast(const_cast< StateCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< StateCanvas*>(this)); + if (!strcmp(_clname, "MultipleDependency")) + return static_cast< MultipleDependency*>(const_cast< StateCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int StateCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StateData.cpp b/src/moc_StateData.cpp new file mode 100644 index 000000000..298e99063 --- /dev/null +++ b/src/moc_StateData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StateData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/StateData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StateData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StateData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_StateData[] = { + "StateData\0\0on_delete()\0" +}; + +void StateData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StateData *_t = static_cast(_o); + switch (_id) { + case 0: _t->on_delete(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StateData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StateData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_StateData, + qt_meta_data_StateData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StateData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StateData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StateData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StateData)) + return static_cast(const_cast< StateData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int StateData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StateDiagramView.cpp b/src/moc_StateDiagramView.cpp new file mode 100644 index 000000000..4838d3bbd --- /dev/null +++ b/src/moc_StateDiagramView.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StateDiagramView.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/StateDiagramView.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StateDiagramView.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StateDiagramView[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_StateDiagramView[] = { + "StateDiagramView\0" +}; + +void StateDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StateDiagramView::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StateDiagramView::staticMetaObject = { + { &DiagramView::staticMetaObject, qt_meta_stringdata_StateDiagramView, + qt_meta_data_StateDiagramView, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StateDiagramView::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StateDiagramView::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StateDiagramView::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StateDiagramView)) + return static_cast(const_cast< StateDiagramView*>(this)); + return DiagramView::qt_metacast(_clname); +} + +int StateDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramView::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StateDiagramWindow.cpp b/src/moc_StateDiagramWindow.cpp new file mode 100644 index 000000000..10375f18a --- /dev/null +++ b/src/moc_StateDiagramWindow.cpp @@ -0,0 +1,147 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StateDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/StateDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StateDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StateDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 23, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 20, 19, 19, 19, 0x09, + 32, 19, 19, 19, 0x09, + 46, 19, 19, 19, 0x09, + 61, 19, 19, 19, 0x09, + 78, 19, 19, 19, 0x09, + 94, 19, 19, 19, 0x09, + 108, 19, 19, 19, 0x09, + 120, 19, 19, 19, 0x09, + 136, 19, 19, 19, 0x09, + 154, 19, 19, 19, 0x09, + 175, 19, 19, 19, 0x09, + 190, 19, 19, 19, 0x09, + 203, 19, 19, 19, 0x09, + 214, 19, 19, 19, 0x09, + 225, 19, 19, 19, 0x09, + 238, 19, 19, 19, 0x09, + 251, 19, 19, 19, 0x09, + 266, 19, 19, 19, 0x09, + 282, 19, 19, 19, 0x09, + 299, 19, 19, 19, 0x09, + 310, 19, 19, 19, 0x09, + 323, 19, 19, 19, 0x09, + 334, 19, 19, 19, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_StateDiagramWindow[] = { + "StateDiagramWindow\0\0hit_state()\0" + "hit_package()\0hit_fragment()\0" + "hit_entryPoint()\0hit_exitPoint()\0" + "hit_initial()\0hit_final()\0hit_terminate()\0" + "hit_deepHistory()\0hit_shallowHistory()\0" + "hit_junction()\0hit_choice()\0hit_fork()\0" + "hit_join()\0hit_region()\0hit_action()\0" + "hit_signalin()\0hit_signalout()\0" + "hit_transition()\0hit_note()\0hit_anchor()\0" + "hit_text()\0hit_image()\0" +}; + +void StateDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StateDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_state(); break; + case 1: _t->hit_package(); break; + case 2: _t->hit_fragment(); break; + case 3: _t->hit_entryPoint(); break; + case 4: _t->hit_exitPoint(); break; + case 5: _t->hit_initial(); break; + case 6: _t->hit_final(); break; + case 7: _t->hit_terminate(); break; + case 8: _t->hit_deepHistory(); break; + case 9: _t->hit_shallowHistory(); break; + case 10: _t->hit_junction(); break; + case 11: _t->hit_choice(); break; + case 12: _t->hit_fork(); break; + case 13: _t->hit_join(); break; + case 14: _t->hit_region(); break; + case 15: _t->hit_action(); break; + case 16: _t->hit_signalin(); break; + case 17: _t->hit_signalout(); break; + case 18: _t->hit_transition(); break; + case 19: _t->hit_note(); break; + case 20: _t->hit_anchor(); break; + case 21: _t->hit_text(); break; + case 22: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StateDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StateDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_StateDiagramWindow, + qt_meta_data_StateDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StateDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StateDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StateDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StateDiagramWindow)) + return static_cast(const_cast< StateDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int StateDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 23) + qt_static_metacall(this, _c, _id, _a); + _id -= 23; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StateDialog.cpp b/src/moc_StateDialog.cpp new file mode 100644 index 000000000..7b756dc2b --- /dev/null +++ b/src/moc_StateDialog.cpp @@ -0,0 +1,130 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StateDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/StateDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StateDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StateDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 16, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x09, + 22, 12, 12, 12, 0x09, + 31, 12, 12, 12, 0x09, + 52, 12, 12, 12, 0x09, + 69, 12, 12, 12, 0x09, + 88, 12, 12, 12, 0x09, + 105, 12, 12, 12, 0x09, + 121, 12, 12, 12, 0x09, + 141, 12, 12, 12, 0x09, + 158, 12, 12, 12, 0x09, + 174, 12, 12, 12, 0x09, + 194, 12, 12, 12, 0x09, + 212, 12, 12, 12, 0x09, + 229, 12, 12, 12, 0x09, + 250, 12, 12, 12, 0x09, + 272, 12, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_StateDialog[] = { + "StateDialog\0\0polish()\0accept()\0" + "menu_specification()\0menu_reference()\0" + "edit_description()\0edit_uml_entry()\0" + "edit_uml_exit()\0edit_uml_activity()\0" + "edit_cpp_entry()\0edit_cpp_exit()\0" + "edit_cpp_activity()\0edit_java_entry()\0" + "edit_java_exit()\0edit_java_activity()\0" + "change_tabs(QWidget*)\0ed_ref_activated(int)\0" +}; + +void StateDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StateDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->menu_specification(); break; + case 3: _t->menu_reference(); break; + case 4: _t->edit_description(); break; + case 5: _t->edit_uml_entry(); break; + case 6: _t->edit_uml_exit(); break; + case 7: _t->edit_uml_activity(); break; + case 8: _t->edit_cpp_entry(); break; + case 9: _t->edit_cpp_exit(); break; + case 10: _t->edit_cpp_activity(); break; + case 11: _t->edit_java_entry(); break; + case 12: _t->edit_java_exit(); break; + case 13: _t->edit_java_activity(); break; + case 14: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + case 15: _t->ed_ref_activated((*reinterpret_cast< int(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData StateDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StateDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_StateDialog, + qt_meta_data_StateDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StateDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StateDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StateDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StateDialog)) + return static_cast(const_cast< StateDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int StateDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 16) + qt_static_metacall(this, _c, _id, _a); + _id -= 16; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StereotypeDialog.cpp b/src/moc_StereotypeDialog.cpp new file mode 100644 index 000000000..3302b46ce --- /dev/null +++ b/src/moc_StereotypeDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StereotypeDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/StereotypeDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StereotypeDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StereotypeDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + 27, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_StereotypeDialog[] = { + "StereotypeDialog\0\0polish()\0accept()\0" +}; + +void StereotypeDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StereotypeDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StereotypeDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StereotypeDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_StereotypeDialog, + qt_meta_data_StereotypeDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StereotypeDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StereotypeDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StereotypeDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StereotypeDialog)) + return static_cast(const_cast< StereotypeDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int StereotypeDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StereotypePropertiesCanvas.cpp b/src/moc_StereotypePropertiesCanvas.cpp new file mode 100644 index 000000000..371bebb13 --- /dev/null +++ b/src/moc_StereotypePropertiesCanvas.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StereotypePropertiesCanvas.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/StereotypePropertiesCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StereotypePropertiesCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StereotypePropertiesCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 28, 27, 27, 27, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_StereotypePropertiesCanvas[] = { + "StereotypePropertiesCanvas\0\0update()\0" +}; + +void StereotypePropertiesCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StereotypePropertiesCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->update(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StereotypePropertiesCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StereotypePropertiesCanvas::staticMetaObject = { + { &NoteCanvas::staticMetaObject, qt_meta_stringdata_StereotypePropertiesCanvas, + qt_meta_data_StereotypePropertiesCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StereotypePropertiesCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StereotypePropertiesCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StereotypePropertiesCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StereotypePropertiesCanvas)) + return static_cast(const_cast< StereotypePropertiesCanvas*>(this)); + return NoteCanvas::qt_metacast(_clname); +} + +int StereotypePropertiesCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = NoteCanvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StereotypesDialog.cpp b/src/moc_StereotypesDialog.cpp new file mode 100644 index 000000000..bd568fcb0 --- /dev/null +++ b/src/moc_StereotypesDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StereotypesDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/StereotypesDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StereotypesDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StereotypesDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x09, + 28, 18, 18, 18, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_StereotypesDialog[] = { + "StereotypesDialog\0\0polish()\0accept()\0" +}; + +void StereotypesDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StereotypesDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData StereotypesDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StereotypesDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_StereotypesDialog, + qt_meta_data_StereotypesDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StereotypesDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StereotypesDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StereotypesDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StereotypesDialog)) + return static_cast(const_cast< StereotypesDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int StereotypesDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_StringTable.cpp b/src/moc_StringTable.cpp new file mode 100644 index 000000000..140c95bd9 --- /dev/null +++ b/src/moc_StringTable.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'StringTable.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/StringTable.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'StringTable.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_StringTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 37, 13, 12, 12, 0x09, + 80, 72, 12, 12, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_StringTable[] = { + "StringTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" + "row,col\0value_changed(int,int)\0" +}; + +void StringTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + StringTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData StringTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject StringTable::staticMetaObject = { + { &MyTable::staticMetaObject, qt_meta_stringdata_StringTable, + qt_meta_data_StringTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &StringTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *StringTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *StringTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_StringTable)) + return static_cast(const_cast< StringTable*>(this)); + return MyTable::qt_metacast(_clname); +} + +int StringTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = MyTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_SubjectCanvas.cpp b/src/moc_SubjectCanvas.cpp new file mode 100644 index 000000000..e8e86a626 --- /dev/null +++ b/src/moc_SubjectCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SubjectCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/SubjectCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SubjectCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SubjectCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_SubjectCanvas[] = { + "SubjectCanvas\0\0modified()\0" +}; + +void SubjectCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SubjectCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SubjectCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SubjectCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_SubjectCanvas, + qt_meta_data_SubjectCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SubjectCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SubjectCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SubjectCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SubjectCanvas)) + return static_cast(const_cast< SubjectCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< SubjectCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int SubjectCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ToolCom.cpp b/src/moc_ToolCom.cpp new file mode 100644 index 000000000..61bcc7218 --- /dev/null +++ b/src/moc_ToolCom.cpp @@ -0,0 +1,107 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ToolCom.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "tool/ToolCom.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ToolCom.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ToolCom[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 9, 8, 8, 8, 0x05, + + // slots: signature, parameters, type, tag, flags + 18, 8, 8, 8, 0x0a, + 38, 8, 8, 8, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_ToolCom[] = { + "ToolCom\0\0closed()\0connexion_timeout()\0" + "processFinished()\0" +}; + +void ToolCom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ToolCom *_t = static_cast(_o); + switch (_id) { + case 0: _t->closed(); break; + case 1: _t->connexion_timeout(); break; + case 2: _t->processFinished(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ToolCom::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ToolCom::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_ToolCom, + qt_meta_data_ToolCom, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ToolCom::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ToolCom::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ToolCom::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ToolCom)) + return static_cast(const_cast< ToolCom*>(this)); + return QObject::qt_metacast(_clname); +} + +int ToolCom::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} + +// SIGNAL 0 +void ToolCom::closed() +{ + QMetaObject::activate(this, &staticMetaObject, 0, 0); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_ToolDialog.cpp b/src/moc_ToolDialog.cpp new file mode 100644 index 000000000..2b10737d0 --- /dev/null +++ b/src/moc_ToolDialog.cpp @@ -0,0 +1,170 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ToolDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/ToolDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ToolDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ToolDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x09, + 21, 11, 11, 11, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ToolDialog[] = { + "ToolDialog\0\0accept()\0polish()\0" +}; + +void ToolDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ToolDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->accept(); break; + case 1: _t->polish(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ToolDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ToolDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ToolDialog, + qt_meta_data_ToolDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ToolDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ToolDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ToolDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ToolDialog)) + return static_cast(const_cast< ToolDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int ToolDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +static const uint qt_meta_data_ToolTable[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 35, 11, 10, 10, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_ToolTable[] = { + "ToolTable\0\0row,col,button,mousePos\0" + "button_pressed(int,int,int,QPoint)\0" +}; + +void ToolTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ToolTable *_t = static_cast(_o); + switch (_id) { + case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData ToolTable::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ToolTable::staticMetaObject = { + { &StringTable::staticMetaObject, qt_meta_stringdata_ToolTable, + qt_meta_data_ToolTable, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ToolTable::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ToolTable::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ToolTable::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ToolTable)) + return static_cast(const_cast< ToolTable*>(this)); + return StringTable::qt_metacast(_clname); +} + +int ToolTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = StringTable::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_TraceDialog.cpp b/src/moc_TraceDialog.cpp new file mode 100644 index 000000000..3a39f8707 --- /dev/null +++ b/src/moc_TraceDialog.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TraceDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/TraceDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TraceDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TraceDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x0a, + 19, 12, 12, 12, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_TraceDialog[] = { + "TraceDialog\0\0clr()\0save()\0" +}; + +void TraceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TraceDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->clr(); break; + case 1: _t->save(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData TraceDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TraceDialog::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_TraceDialog, + qt_meta_data_TraceDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TraceDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TraceDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TraceDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TraceDialog)) + return static_cast(const_cast< TraceDialog*>(this)); + return QDialog::qt_metacast(_clname); +} + +int TraceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_TransitionCanvas.cpp b/src/moc_TransitionCanvas.cpp new file mode 100644 index 000000000..850944f42 --- /dev/null +++ b/src/moc_TransitionCanvas.cpp @@ -0,0 +1,96 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TransitionCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/TransitionCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TransitionCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TransitionCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x08, + 29, 17, 17, 17, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_TransitionCanvas[] = { + "TransitionCanvas\0\0modified()\0deleted()\0" +}; + +void TransitionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TransitionCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData TransitionCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TransitionCanvas::staticMetaObject = { + { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_TransitionCanvas, + qt_meta_data_TransitionCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TransitionCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TransitionCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TransitionCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TransitionCanvas)) + return static_cast(const_cast< TransitionCanvas*>(this)); + return ArrowCanvas::qt_metacast(_clname); +} + +int TransitionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = ArrowCanvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_TransitionData.cpp b/src/moc_TransitionData.cpp new file mode 100644 index 000000000..bfd512831 --- /dev/null +++ b/src/moc_TransitionData.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TransitionData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/TransitionData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TransitionData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TransitionData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 16, 15, 15, 15, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_TransitionData[] = { + "TransitionData\0\0end_deleted()\0" +}; + +void TransitionData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TransitionData *_t = static_cast(_o); + switch (_id) { + case 0: _t->end_deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData TransitionData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TransitionData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_TransitionData, + qt_meta_data_TransitionData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TransitionData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TransitionData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TransitionData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TransitionData)) + return static_cast(const_cast< TransitionData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int TransitionData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_TransitionDialog.cpp b/src/moc_TransitionDialog.cpp new file mode 100644 index 000000000..625417ada --- /dev/null +++ b/src/moc_TransitionDialog.cpp @@ -0,0 +1,123 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TransitionDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/TransitionDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TransitionDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TransitionDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 13, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 18, 17, 17, 17, 0x09, + 27, 17, 17, 17, 0x09, + 36, 17, 17, 17, 0x09, + 55, 17, 17, 17, 0x09, + 74, 17, 17, 17, 0x09, + 91, 17, 17, 17, 0x09, + 107, 17, 17, 17, 0x09, + 126, 17, 17, 17, 0x09, + 143, 17, 17, 17, 0x09, + 159, 17, 17, 17, 0x09, + 179, 17, 17, 17, 0x09, + 197, 17, 17, 17, 0x09, + 214, 17, 17, 17, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_TransitionDialog[] = { + "TransitionDialog\0\0polish()\0accept()\0" + "edit_description()\0edit_uml_trigger()\0" + "edit_uml_guard()\0edit_uml_expr()\0" + "edit_cpp_trigger()\0edit_cpp_guard()\0" + "edit_cpp_expr()\0edit_java_trigger()\0" + "edit_java_guard()\0edit_java_expr()\0" + "change_tabs(QWidget*)\0" +}; + +void TransitionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TransitionDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + case 3: _t->edit_uml_trigger(); break; + case 4: _t->edit_uml_guard(); break; + case 5: _t->edit_uml_expr(); break; + case 6: _t->edit_cpp_trigger(); break; + case 7: _t->edit_cpp_guard(); break; + case 8: _t->edit_cpp_expr(); break; + case 9: _t->edit_java_trigger(); break; + case 10: _t->edit_java_guard(); break; + case 11: _t->edit_java_expr(); break; + case 12: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData TransitionDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TransitionDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_TransitionDialog, + qt_meta_data_TransitionDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TransitionDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TransitionDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TransitionDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TransitionDialog)) + return static_cast(const_cast< TransitionDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int TransitionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 13) + qt_static_metacall(this, _c, _id, _a); + _id -= 13; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UcClassCanvas.cpp b/src/moc_UcClassCanvas.cpp new file mode 100644 index 000000000..fdb9824c7 --- /dev/null +++ b/src/moc_UcClassCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UcClassCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/UcClassCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UcClassCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UcClassCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x08, + 26, 14, 14, 14, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_UcClassCanvas[] = { + "UcClassCanvas\0\0modified()\0deleted()\0" +}; + +void UcClassCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + UcClassCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData UcClassCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UcClassCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_UcClassCanvas, + qt_meta_data_UcClassCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UcClassCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UcClassCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UcClassCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UcClassCanvas)) + return static_cast(const_cast< UcClassCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< UcClassCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int UcClassCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UcUseCaseCanvas.cpp b/src/moc_UcUseCaseCanvas.cpp new file mode 100644 index 000000000..754f78f2d --- /dev/null +++ b/src/moc_UcUseCaseCanvas.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UcUseCaseCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/UcUseCaseCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UcUseCaseCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UcUseCaseCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 17, 16, 16, 16, 0x08, + 28, 16, 16, 16, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_UcUseCaseCanvas[] = { + "UcUseCaseCanvas\0\0modified()\0deleted()\0" +}; + +void UcUseCaseCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + UcUseCaseCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->modified(); break; + case 1: _t->deleted(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData UcUseCaseCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UcUseCaseCanvas::staticMetaObject = { + { &QObject::staticMetaObject, qt_meta_stringdata_UcUseCaseCanvas, + qt_meta_data_UcUseCaseCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UcUseCaseCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UcUseCaseCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UcUseCaseCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UcUseCaseCanvas)) + return static_cast(const_cast< UcUseCaseCanvas*>(this)); + if (!strcmp(_clname, "DiagramCanvas")) + return static_cast< DiagramCanvas*>(const_cast< UcUseCaseCanvas*>(this)); + return QObject::qt_metacast(_clname); +} + +int UcUseCaseCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QObject::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UmlCanvas.cpp b/src/moc_UmlCanvas.cpp new file mode 100644 index 000000000..bbd595407 --- /dev/null +++ b/src/moc_UmlCanvas.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UmlCanvas.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/UmlCanvas.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UmlCanvas.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UmlCanvas[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_UmlCanvas[] = { + "UmlCanvas\0\0update()\0" +}; + +void UmlCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + UmlCanvas *_t = static_cast(_o); + switch (_id) { + case 0: _t->update(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData UmlCanvas::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UmlCanvas::staticMetaObject = { + { &Q3Canvas::staticMetaObject, qt_meta_stringdata_UmlCanvas, + qt_meta_data_UmlCanvas, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UmlCanvas::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UmlCanvas::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UmlCanvas::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UmlCanvas)) + return static_cast(const_cast< UmlCanvas*>(this)); + return Q3Canvas::qt_metacast(_clname); +} + +int UmlCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3Canvas::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UmlWindow.cpp b/src/moc_UmlWindow.cpp new file mode 100644 index 000000000..21eb039cc --- /dev/null +++ b/src/moc_UmlWindow.cpp @@ -0,0 +1,295 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UmlWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/UmlWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UmlWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UmlWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 81, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x08, + 24, 10, 10, 10, 0x08, + 42, 10, 10, 10, 0x08, + 49, 10, 10, 10, 0x08, + 56, 10, 10, 10, 0x08, + 65, 10, 10, 10, 0x08, + 73, 10, 10, 10, 0x08, + 81, 10, 10, 10, 0x08, + 88, 10, 10, 10, 0x08, + 105, 10, 10, 10, 0x08, + 119, 10, 10, 10, 0x08, + 133, 10, 10, 10, 0x08, + 153, 10, 10, 10, 0x08, + 172, 10, 10, 10, 0x08, + 194, 10, 10, 10, 0x08, + 218, 10, 10, 10, 0x08, + 228, 10, 10, 10, 0x08, + 239, 10, 10, 10, 0x08, + 249, 10, 10, 10, 0x08, + 262, 10, 10, 10, 0x08, + 277, 10, 272, 10, 0x08, + 289, 10, 272, 10, 0x08, + 302, 10, 272, 10, 0x08, + 314, 10, 272, 10, 0x08, + 329, 10, 272, 10, 0x08, + 341, 10, 10, 10, 0x08, + 351, 10, 10, 10, 0x08, + 362, 10, 10, 10, 0x08, + 384, 10, 10, 10, 0x08, + 401, 10, 10, 10, 0x08, + 412, 10, 10, 10, 0x08, + 434, 10, 10, 10, 0x08, + 448, 10, 10, 10, 0x08, + 466, 10, 10, 10, 0x08, + 482, 10, 10, 10, 0x08, + 501, 10, 10, 10, 0x08, + 517, 10, 10, 10, 0x08, + 525, 10, 10, 10, 0x08, + 535, 10, 10, 10, 0x08, + 542, 10, 10, 10, 0x08, + 555, 10, 10, 10, 0x08, + 570, 10, 10, 10, 0x08, + 586, 10, 10, 10, 0x08, + 601, 10, 10, 10, 0x08, + 619, 10, 10, 10, 0x08, + 634, 10, 10, 10, 0x08, + 649, 10, 10, 10, 0x08, + 663, 10, 10, 10, 0x08, + 679, 10, 10, 10, 0x08, + 694, 10, 10, 10, 0x08, + 711, 10, 10, 10, 0x08, + 725, 10, 10, 10, 0x08, + 742, 10, 10, 10, 0x08, + 762, 10, 10, 10, 0x08, + 783, 10, 10, 10, 0x08, + 803, 10, 10, 10, 0x08, + 832, 826, 10, 10, 0x08, + 846, 10, 10, 10, 0x08, + 862, 10, 10, 10, 0x08, + 885, 10, 10, 10, 0x08, + 904, 10, 10, 10, 0x08, + 922, 10, 10, 10, 0x08, + 943, 10, 10, 10, 0x08, + 963, 10, 10, 10, 0x08, + 985, 10, 10, 10, 0x08, + 1013, 1010, 10, 10, 0x08, + 1036, 10, 10, 10, 0x08, + 1058, 10, 10, 10, 0x08, + 1080, 10, 10, 10, 0x08, + 1106, 10, 10, 10, 0x08, + 1123, 10, 10, 10, 0x08, + 1147, 10, 10, 10, 0x08, + 1162, 10, 10, 10, 0x08, + 1187, 1010, 10, 10, 0x08, + 1213, 1010, 10, 10, 0x08, + 1241, 1239, 10, 10, 0x08, + 1267, 10, 10, 10, 0x0a, + 1282, 1280, 10, 10, 0x0a, + 1336, 1331, 10, 10, 0x0a, + 1375, 10, 10, 10, 0x0a, + 1393, 10, 10, 10, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_UmlWindow[] = { + "UmlWindow\0\0newProject()\0newFromTemplate()\0" + "load()\0save()\0saveAs()\0print()\0close()\0" + "quit()\0browser_search()\0next_select()\0" + "prev_select()\0edit_gen_settings()\0" + "edit_stereotypes()\0edit_class_settings()\0" + "edit_drawing_settings()\0use_cpp()\0" + "use_java()\0use_php()\0use_python()\0" + "use_idl()\0bool\0using_cpp()\0using_java()\0" + "using_php()\0using_python()\0using_idl()\0" + "verbose()\0preserve()\0addoperationprofile()\0" + "edit_shortcuts()\0edit_env()\0" + "edit_image_root_dir()\0motif_style()\0" + "motifplus_style()\0windows_style()\0" + "show_stereotypes()\0do_completion()\0" + "about()\0aboutQt()\0help()\0show_trace()\0" + "cpp_generate()\0java_generate()\0" + "php_generate()\0python_generate()\0" + "idl_generate()\0java_catalog()\0" + "cpp_reverse()\0cpp_roundtrip()\0" + "java_reverse()\0java_roundtrip()\0" + "php_reverse()\0python_reverse()\0" + "cpp_roundtripbody()\0java_roundtripbody()\0" + "php_roundtripbody()\0python_roundtripbody()\0" + "param\0run_tool(int)\0tool_settings()\0" + "import_tool_settings()\0plug_out_upgrade()\0" + "comment_changed()\0preferred_geometry()\0" + "close_all_windows()\0toolMenuAboutToShow()\0" + "projectMenuAboutToShow()\0id\0" + "historicActivated(int)\0langMenuAboutToShow()\0" + "miscMenuAboutToShow()\0fontSizeMenuAboutToShow()\0" + "setFontSize(int)\0formatMenuAboutToShow()\0" + "setFormat(int)\0windowsMenuAboutToShow()\0" + "windowsMenuActivated(int)\0" + "dialogsMenuActivated(int)\0e\0" + "keyPressEvent(QKeyEvent*)\0whats_this()\0" + ",\0OnPickSelectionFromItem(QModelIndex,QModelIndex)\0" + "item\0OnChooseQuickEditMode(Q3ListViewItem*)\0" + "OnShowQuickEdit()\0OnCallClipboardMenu()\0" +}; + +void UmlWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + UmlWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->newProject(); break; + case 1: _t->newFromTemplate(); break; + case 2: _t->load(); break; + case 3: _t->save(); break; + case 4: _t->saveAs(); break; + case 5: _t->print(); break; + case 6: _t->close(); break; + case 7: _t->quit(); break; + case 8: _t->browser_search(); break; + case 9: _t->next_select(); break; + case 10: _t->prev_select(); break; + case 11: _t->edit_gen_settings(); break; + case 12: _t->edit_stereotypes(); break; + case 13: _t->edit_class_settings(); break; + case 14: _t->edit_drawing_settings(); break; + case 15: _t->use_cpp(); break; + case 16: _t->use_java(); break; + case 17: _t->use_php(); break; + case 18: _t->use_python(); break; + case 19: _t->use_idl(); break; + case 20: { bool _r = _t->using_cpp(); + if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; + case 21: { bool _r = _t->using_java(); + if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; + case 22: { bool _r = _t->using_php(); + if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; + case 23: { bool _r = _t->using_python(); + if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; + case 24: { bool _r = _t->using_idl(); + if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; + case 25: _t->verbose(); break; + case 26: _t->preserve(); break; + case 27: _t->addoperationprofile(); break; + case 28: _t->edit_shortcuts(); break; + case 29: _t->edit_env(); break; + case 30: _t->edit_image_root_dir(); break; + case 31: _t->motif_style(); break; + case 32: _t->motifplus_style(); break; + case 33: _t->windows_style(); break; + case 34: _t->show_stereotypes(); break; + case 35: _t->do_completion(); break; + case 36: _t->about(); break; + case 37: _t->aboutQt(); break; + case 38: _t->help(); break; + case 39: _t->show_trace(); break; + case 40: _t->cpp_generate(); break; + case 41: _t->java_generate(); break; + case 42: _t->php_generate(); break; + case 43: _t->python_generate(); break; + case 44: _t->idl_generate(); break; + case 45: _t->java_catalog(); break; + case 46: _t->cpp_reverse(); break; + case 47: _t->cpp_roundtrip(); break; + case 48: _t->java_reverse(); break; + case 49: _t->java_roundtrip(); break; + case 50: _t->php_reverse(); break; + case 51: _t->python_reverse(); break; + case 52: _t->cpp_roundtripbody(); break; + case 53: _t->java_roundtripbody(); break; + case 54: _t->php_roundtripbody(); break; + case 55: _t->python_roundtripbody(); break; + case 56: _t->run_tool((*reinterpret_cast< int(*)>(_a[1]))); break; + case 57: _t->tool_settings(); break; + case 58: _t->import_tool_settings(); break; + case 59: _t->plug_out_upgrade(); break; + case 60: _t->comment_changed(); break; + case 61: _t->preferred_geometry(); break; + case 62: _t->close_all_windows(); break; + case 63: _t->toolMenuAboutToShow(); break; + case 64: _t->projectMenuAboutToShow(); break; + case 65: _t->historicActivated((*reinterpret_cast< int(*)>(_a[1]))); break; + case 66: _t->langMenuAboutToShow(); break; + case 67: _t->miscMenuAboutToShow(); break; + case 68: _t->fontSizeMenuAboutToShow(); break; + case 69: _t->setFontSize((*reinterpret_cast< int(*)>(_a[1]))); break; + case 70: _t->formatMenuAboutToShow(); break; + case 71: _t->setFormat((*reinterpret_cast< int(*)>(_a[1]))); break; + case 72: _t->windowsMenuAboutToShow(); break; + case 73: _t->windowsMenuActivated((*reinterpret_cast< int(*)>(_a[1]))); break; + case 74: _t->dialogsMenuActivated((*reinterpret_cast< int(*)>(_a[1]))); break; + case 75: _t->keyPressEvent((*reinterpret_cast< QKeyEvent*(*)>(_a[1]))); break; + case 76: _t->whats_this(); break; + case 77: _t->OnPickSelectionFromItem((*reinterpret_cast< const QModelIndex(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2]))); break; + case 78: _t->OnChooseQuickEditMode((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; + case 79: _t->OnShowQuickEdit(); break; + case 80: _t->OnCallClipboardMenu(); break; + default: ; + } + } +} + +const QMetaObjectExtraData UmlWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UmlWindow::staticMetaObject = { + { &QMainWindow::staticMetaObject, qt_meta_stringdata_UmlWindow, + qt_meta_data_UmlWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UmlWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UmlWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UmlWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UmlWindow)) + return static_cast(const_cast< UmlWindow*>(this)); + return QMainWindow::qt_metacast(_clname); +} + +int UmlWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QMainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 81) + qt_static_metacall(this, _c, _id, _a); + _id -= 81; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseData.cpp b/src/moc_UseCaseData.cpp new file mode 100644 index 000000000..dc297a0eb --- /dev/null +++ b/src/moc_UseCaseData.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UseCaseData.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "data/UseCaseData.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UseCaseData.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UseCaseData[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_UseCaseData[] = { + "UseCaseData\0" +}; + +void UseCaseData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData UseCaseData::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UseCaseData::staticMetaObject = { + { &SimpleData::staticMetaObject, qt_meta_stringdata_UseCaseData, + qt_meta_data_UseCaseData, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UseCaseData::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UseCaseData::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UseCaseData::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UseCaseData)) + return static_cast(const_cast< UseCaseData*>(this)); + return SimpleData::qt_metacast(_clname); +} + +int UseCaseData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = SimpleData::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseDiagramView.cpp b/src/moc_UseCaseDiagramView.cpp new file mode 100644 index 000000000..4a5250781 --- /dev/null +++ b/src/moc_UseCaseDiagramView.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UseCaseDiagramView.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/UseCaseDiagramView.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UseCaseDiagramView.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UseCaseDiagramView[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_UseCaseDiagramView[] = { + "UseCaseDiagramView\0" +}; + +void UseCaseDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData UseCaseDiagramView::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UseCaseDiagramView::staticMetaObject = { + { &DiagramView::staticMetaObject, qt_meta_stringdata_UseCaseDiagramView, + qt_meta_data_UseCaseDiagramView, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UseCaseDiagramView::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UseCaseDiagramView::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UseCaseDiagramView::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UseCaseDiagramView)) + return static_cast(const_cast< UseCaseDiagramView*>(this)); + return DiagramView::qt_metacast(_clname); +} + +int UseCaseDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramView::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseDiagramWindow.cpp b/src/moc_UseCaseDiagramWindow.cpp new file mode 100644 index 000000000..74cf9d292 --- /dev/null +++ b/src/moc_UseCaseDiagramWindow.cpp @@ -0,0 +1,124 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UseCaseDiagramWindow.h' +** +** Created: Fri May 24 23:48:40 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "diagram/UseCaseDiagramWindow.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UseCaseDiagramWindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UseCaseDiagramWindow[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 13, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 22, 21, 21, 21, 0x09, + 34, 21, 21, 21, 0x09, + 48, 21, 21, 21, 0x09, + 62, 21, 21, 21, 0x09, + 77, 21, 21, 21, 0x09, + 91, 21, 21, 21, 0x09, + 109, 21, 21, 21, 0x09, + 138, 21, 21, 21, 0x09, + 155, 21, 21, 21, 0x09, + 169, 21, 21, 21, 0x09, + 180, 21, 21, 21, 0x09, + 193, 21, 21, 21, 0x09, + 204, 21, 21, 21, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_UseCaseDiagramWindow[] = { + "UseCaseDiagramWindow\0\0hit_class()\0" + "hit_usecase()\0hit_package()\0hit_fragment()\0" + "hit_subject()\0hit_association()\0" + "hit_directionalassociation()\0" + "hit_dependency()\0hit_inherit()\0" + "hit_note()\0hit_anchor()\0hit_text()\0" + "hit_image()\0" +}; + +void UseCaseDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + UseCaseDiagramWindow *_t = static_cast(_o); + switch (_id) { + case 0: _t->hit_class(); break; + case 1: _t->hit_usecase(); break; + case 2: _t->hit_package(); break; + case 3: _t->hit_fragment(); break; + case 4: _t->hit_subject(); break; + case 5: _t->hit_association(); break; + case 6: _t->hit_directionalassociation(); break; + case 7: _t->hit_dependency(); break; + case 8: _t->hit_inherit(); break; + case 9: _t->hit_note(); break; + case 10: _t->hit_anchor(); break; + case 11: _t->hit_text(); break; + case 12: _t->hit_image(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData UseCaseDiagramWindow::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UseCaseDiagramWindow::staticMetaObject = { + { &DiagramWindow::staticMetaObject, qt_meta_stringdata_UseCaseDiagramWindow, + qt_meta_data_UseCaseDiagramWindow, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UseCaseDiagramWindow::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UseCaseDiagramWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UseCaseDiagramWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UseCaseDiagramWindow)) + return static_cast(const_cast< UseCaseDiagramWindow*>(this)); + return DiagramWindow::qt_metacast(_clname); +} + +int UseCaseDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = DiagramWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 13) + qt_static_metacall(this, _c, _id, _a); + _id -= 13; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseDialog.cpp b/src/moc_UseCaseDialog.cpp new file mode 100644 index 000000000..24d54eac3 --- /dev/null +++ b/src/moc_UseCaseDialog.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'UseCaseDialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/UseCaseDialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'UseCaseDialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_UseCaseDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 15, 14, 14, 14, 0x09, + 24, 14, 14, 14, 0x09, + 33, 14, 14, 14, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_UseCaseDialog[] = { + "UseCaseDialog\0\0polish()\0accept()\0" + "edit_description()\0" +}; + +void UseCaseDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + UseCaseDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->polish(); break; + case 1: _t->accept(); break; + case 2: _t->edit_description(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData UseCaseDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject UseCaseDialog::staticMetaObject = { + { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_UseCaseDialog, + qt_meta_data_UseCaseDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &UseCaseDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *UseCaseDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *UseCaseDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_UseCaseDialog)) + return static_cast(const_cast< UseCaseDialog*>(this)); + return Q3TabDialog::qt_metacast(_clname); +} + +int UseCaseDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = Q3TabDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_catalogwidget.cpp b/src/moc_catalogwidget.cpp new file mode 100644 index 000000000..b89a6d448 --- /dev/null +++ b/src/moc_catalogwidget.cpp @@ -0,0 +1,146 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'catalogwidget.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "ui/catalogwidget.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'catalogwidget.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CatalogWidget[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 14, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 2, // signalCount + + // signals: signature, parameters, type, tag, flags + 17, 15, 14, 14, 0x05, + 43, 14, 14, 14, 0x05, + + // slots: signature, parameters, type, tag, flags + 61, 14, 14, 14, 0x0a, + 96, 14, 14, 14, 0x0a, + 123, 14, 14, 14, 0x0a, + 159, 154, 14, 14, 0x0a, + 196, 14, 14, 14, 0x0a, + 236, 14, 14, 14, 0x0a, + 261, 15, 14, 14, 0x0a, + 306, 14, 14, 14, 0x0a, + 342, 14, 14, 14, 0x0a, + 374, 14, 14, 14, 0x0a, + 403, 14, 14, 14, 0x0a, + 441, 435, 14, 14, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_CatalogWidget[] = { + "CatalogWidget\0\0,\0markedRemove(QString,int)\0" + "allMarkedRemove()\0OnPerformVisitedFiltering(QString)\0" + "OnPerformMarkedFiltering()\0" + "OnPerformFavouritesFiltering()\0item\0" + "OnUpdateVisitedView(Q3ListViewItem*)\0" + "OnUpdateMarkedView(QList)\0" + "OnUpdateFavoutitesView()\0" + "OnSelectedInVisited(QModelIndex,QModelIndex)\0" + "OnRemoveCurrentItemFromFavourites()\0" + "OnRemoveCurrentItemFromMarked()\0" + "OnRemoveAllItemsFromMarked()\0" + "OnFavouritesContextMenu(QPoint)\0point\0" + "OnMarkedContextMenu(QPoint)\0" +}; + +void CatalogWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CatalogWidget *_t = static_cast(_o); + switch (_id) { + case 0: _t->markedRemove((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; + case 1: _t->allMarkedRemove(); break; + case 2: _t->OnPerformVisitedFiltering((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 3: _t->OnPerformMarkedFiltering(); break; + case 4: _t->OnPerformFavouritesFiltering(); break; + case 5: _t->OnUpdateVisitedView((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; + case 6: _t->OnUpdateMarkedView((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 7: _t->OnUpdateFavoutitesView(); break; + case 8: _t->OnSelectedInVisited((*reinterpret_cast< const QModelIndex(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2]))); break; + case 9: _t->OnRemoveCurrentItemFromFavourites(); break; + case 10: _t->OnRemoveCurrentItemFromMarked(); break; + case 11: _t->OnRemoveAllItemsFromMarked(); break; + case 12: _t->OnFavouritesContextMenu((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 13: _t->OnMarkedContextMenu((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData CatalogWidget::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CatalogWidget::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_CatalogWidget, + qt_meta_data_CatalogWidget, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CatalogWidget::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CatalogWidget::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CatalogWidget::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CatalogWidget)) + return static_cast(const_cast< CatalogWidget*>(this)); + return QWidget::qt_metacast(_clname); +} + +int CatalogWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 14) + qt_static_metacall(this, _c, _id, _a); + _id -= 14; + } + return _id; +} + +// SIGNAL 0 +void CatalogWidget::markedRemove(QString _t1, int _t2) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)), const_cast(reinterpret_cast(&_t2)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} + +// SIGNAL 1 +void CatalogWidget::allMarkedRemove() +{ + QMetaObject::activate(this, &staticMetaObject, 1, 0); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_constructorinitializerdialog.cpp b/src/moc_constructorinitializerdialog.cpp new file mode 100644 index 000000000..7fa704fb0 --- /dev/null +++ b/src/moc_constructorinitializerdialog.cpp @@ -0,0 +1,95 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'constructorinitializerdialog.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "ui/constructorinitializerdialog.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'constructorinitializerdialog.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_ConstructorInitializerDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 30, 29, 29, 29, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_ConstructorInitializerDialog[] = { + "ConstructorInitializerDialog\0\0" + "OnInitializerChanged()\0" +}; + +void ConstructorInitializerDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + ConstructorInitializerDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->OnInitializerChanged(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData ConstructorInitializerDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject ConstructorInitializerDialog::staticMetaObject = { + { &EdgeMenuDialogQt4::staticMetaObject, qt_meta_stringdata_ConstructorInitializerDialog, + qt_meta_data_ConstructorInitializerDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &ConstructorInitializerDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *ConstructorInitializerDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *ConstructorInitializerDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_ConstructorInitializerDialog)) + return static_cast(const_cast< ConstructorInitializerDialog*>(this)); + return EdgeMenuDialogQt4::qt_metacast(_clname); +} + +int ConstructorInitializerDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = EdgeMenuDialogQt4::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_edgemenudialogqt4.cpp b/src/moc_edgemenudialogqt4.cpp new file mode 100644 index 000000000..f1c55a380 --- /dev/null +++ b/src/moc_edgemenudialogqt4.cpp @@ -0,0 +1,144 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'edgemenudialogqt4.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "dialog/edgemenudialogqt4.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'edgemenudialogqt4.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_EdgeMenuDialogQt4[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 9, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 4, // signalCount + + // signals: signature, parameters, type, tag, flags + 19, 18, 18, 18, 0x05, + 43, 18, 18, 18, 0x05, + 55, 18, 18, 18, 0x05, + 70, 18, 18, 18, 0x05, + + // slots: signature, parameters, type, tag, flags + 93, 18, 18, 18, 0x0a, + 113, 18, 18, 18, 0x0a, + 137, 18, 18, 18, 0x0a, + 160, 18, 18, 18, 0x0a, + 185, 18, 18, 18, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_EdgeMenuDialogQt4[] = { + "EdgeMenuDialogQt4\0\0edgeMenuRequested(uint)\0" + "lostFocus()\0hideEdgeMenu()\0" + "repositionMenu(QPoint)\0OnPickNextSibling()\0" + "OnPickPreviousSibling()\0OnInitiateMove(QPoint)\0" + "OnInitiateResize(QPoint)\0" + "OnNewCoordinatesReceived(QPoint)\0" +}; + +void EdgeMenuDialogQt4::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + EdgeMenuDialogQt4 *_t = static_cast(_o); + switch (_id) { + case 0: _t->edgeMenuRequested((*reinterpret_cast< uint(*)>(_a[1]))); break; + case 1: _t->lostFocus(); break; + case 2: _t->hideEdgeMenu(); break; + case 3: _t->repositionMenu((*reinterpret_cast< const QPoint(*)>(_a[1]))); break; + case 4: _t->OnPickNextSibling(); break; + case 5: _t->OnPickPreviousSibling(); break; + case 6: _t->OnInitiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 7: _t->OnInitiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 8: _t->OnNewCoordinatesReceived((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData EdgeMenuDialogQt4::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject EdgeMenuDialogQt4::staticMetaObject = { + { &QDialog::staticMetaObject, qt_meta_stringdata_EdgeMenuDialogQt4, + qt_meta_data_EdgeMenuDialogQt4, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &EdgeMenuDialogQt4::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *EdgeMenuDialogQt4::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *EdgeMenuDialogQt4::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuDialogQt4)) + return static_cast(const_cast< EdgeMenuDialogQt4*>(this)); + if (!strcmp(_clname, "EdgeMenuDialogBase")) + return static_cast< EdgeMenuDialogBase*>(const_cast< EdgeMenuDialogQt4*>(this)); + return QDialog::qt_metacast(_clname); +} + +int EdgeMenuDialogQt4::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 9) + qt_static_metacall(this, _c, _id, _a); + _id -= 9; + } + return _id; +} + +// SIGNAL 0 +void EdgeMenuDialogQt4::edgeMenuRequested(uint _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} + +// SIGNAL 1 +void EdgeMenuDialogQt4::lostFocus() +{ + QMetaObject::activate(this, &staticMetaObject, 1, 0); +} + +// SIGNAL 2 +void EdgeMenuDialogQt4::hideEdgeMenu() +{ + QMetaObject::activate(this, &staticMetaObject, 2, 0); +} + +// SIGNAL 3 +void EdgeMenuDialogQt4::repositionMenu(const QPoint & _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 3, _a); +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_operationwidgetcpp.cpp b/src/moc_operationwidgetcpp.cpp new file mode 100644 index 000000000..6b59a5876 --- /dev/null +++ b/src/moc_operationwidgetcpp.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'operationwidgetcpp.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "ui/operationwidgetcpp.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'operationwidgetcpp.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_OperationWidgetCpp[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + 0 // eod +}; + +static const char qt_meta_stringdata_OperationWidgetCpp[] = { + "OperationWidgetCpp\0" +}; + +void OperationWidgetCpp::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +const QMetaObjectExtraData OperationWidgetCpp::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject OperationWidgetCpp::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_OperationWidgetCpp, + qt_meta_data_OperationWidgetCpp, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &OperationWidgetCpp::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *OperationWidgetCpp::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *OperationWidgetCpp::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_OperationWidgetCpp)) + return static_cast(const_cast< OperationWidgetCpp*>(this)); + return QWidget::qt_metacast(_clname); +} + +int OperationWidgetCpp::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + return _id; +} +QT_END_MOC_NAMESPACE diff --git a/src/moc_quickedit.cpp b/src/moc_quickedit.cpp new file mode 100644 index 000000000..387d17db1 --- /dev/null +++ b/src/moc_quickedit.cpp @@ -0,0 +1,126 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'quickedit.h' +** +** Created: Fri May 24 23:48:41 2013 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "CustomWidgets/quickedit.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'quickedit.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.3. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_QuickEdit[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 14, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 11, 10, 10, 10, 0x0a, + 33, 10, 10, 10, 0x0a, + 42, 10, 10, 10, 0x0a, + 59, 10, 10, 10, 0x0a, + 76, 10, 10, 10, 0x0a, + 93, 10, 10, 10, 0x0a, + 121, 10, 10, 10, 0x0a, + 144, 10, 10, 10, 0x0a, + 167, 10, 10, 10, 0x0a, + 194, 10, 10, 10, 0x0a, + 214, 10, 10, 10, 0x0a, + 235, 10, 10, 10, 0x0a, + 252, 10, 10, 10, 0x0a, + 275, 10, 10, 10, 0x0a, + + 0 // eod +}; + +static const char qt_meta_stringdata_QuickEdit[] = { + "QuickEdit\0\0OnContextMenu(QPoint)\0" + "OnShow()\0OnAddParameter()\0OnAddOperation()\0" + "OnAddAttribute()\0OnPerformFiltering(QString)\0" + "OnDecreaseOpenLevels()\0OnIncreaseOpenLevels()\0" + "OnChangeColumnVisibility()\0" + "OnMoveMarkedAfter()\0OnMoveMarkedBefore()\0" + "OnRefreshTable()\0OnCollapseExpandSelf()\0" + "OnCollapseExpandParent()\0" +}; + +void QuickEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + QuickEdit *_t = static_cast(_o); + switch (_id) { + case 0: _t->OnContextMenu((*reinterpret_cast< QPoint(*)>(_a[1]))); break; + case 1: _t->OnShow(); break; + case 2: _t->OnAddParameter(); break; + case 3: _t->OnAddOperation(); break; + case 4: _t->OnAddAttribute(); break; + case 5: _t->OnPerformFiltering((*reinterpret_cast< QString(*)>(_a[1]))); break; + case 6: _t->OnDecreaseOpenLevels(); break; + case 7: _t->OnIncreaseOpenLevels(); break; + case 8: _t->OnChangeColumnVisibility(); break; + case 9: _t->OnMoveMarkedAfter(); break; + case 10: _t->OnMoveMarkedBefore(); break; + case 11: _t->OnRefreshTable(); break; + case 12: _t->OnCollapseExpandSelf(); break; + case 13: _t->OnCollapseExpandParent(); break; + default: ; + } + } +} + +const QMetaObjectExtraData QuickEdit::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject QuickEdit::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_QuickEdit, + qt_meta_data_QuickEdit, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &QuickEdit::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *QuickEdit::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *QuickEdit::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_QuickEdit)) + return static_cast(const_cast< QuickEdit*>(this)); + return QWidget::qt_metacast(_clname); +} + +int QuickEdit::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 14) + qt_static_metacall(this, _c, _id, _a); + _id -= 14; + } + return _id; +} +QT_END_MOC_NAMESPACE From e01a8678e97435bb54afd8cfd3d11cb3a95dc40e Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 25 May 2013 00:25:33 +0400 Subject: [PATCH 099/297] changed to std::shared_ptr --- src/dialog/ClassDialog.cpp | 8 ++++---- src/dialog/ClassDialog.h | 3 ++- src/moc_ClassDialog.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/dialog/ClassDialog.cpp b/src/dialog/ClassDialog.cpp index 2f49e13da..a3096a1d0 100644 --- a/src/dialog/ClassDialog.cpp +++ b/src/dialog/ClassDialog.cpp @@ -112,11 +112,11 @@ ClassDialog::~ClassDialog() } } -QSharedPointer ClassDialog::Instance(ClassData * cl) +std::shared_ptr ClassDialog::Instance(ClassData * cl) { - static QSharedPointer instance; - if (instance.isNull()) - instance = QSharedPointer(new ClassDialog(cl)); + static std::shared_ptr instance; + if (!instance) + instance.reset(new ClassDialog(cl)); else instance->FillGuiElements(cl); diff --git a/src/dialog/ClassDialog.h b/src/dialog/ClassDialog.h index 67dfe1747..76718e22c 100644 --- a/src/dialog/ClassDialog.h +++ b/src/dialog/ClassDialog.h @@ -40,6 +40,7 @@ #include #include #include +#include #include "MyTable.h" #include "BrowserNode.h" @@ -232,7 +233,7 @@ class ClassDialog : public EdgeMenuDialog ClassDialog(ClassData * c); virtual ~ClassDialog(); - static QSharedPointer Instance(ClassData *); + static std::shared_ptr Instance(ClassData *); static void cpp_generate_decl(QString & s, ClassData * cl, QString def, QString name, diff --git a/src/moc_ClassDialog.cpp b/src/moc_ClassDialog.cpp index fe56e4ab4..1c6e3fec1 100644 --- a/src/moc_ClassDialog.cpp +++ b/src/moc_ClassDialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'ClassDialog.h' ** -** Created: Sat May 25 00:03:48 2013 +** Created: Sat May 25 00:24:50 2013 ** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) ** ** WARNING! All changes made in this file will be lost! From 3d1fe86ad6565e98f53e05c8d11277b63f0a6c7b Mon Sep 17 00:00:00 2001 From: pasgui Date: Sat, 25 May 2013 16:08:54 +0200 Subject: [PATCH 100/297] Remove settings_ini.h file --- Makefile | 5 +-- src/dialog/EnvDialog.cpp | 7 +-- src/main.cpp | 38 ++++++++-------- src/settings_ini.h | 93 ---------------------------------------- 4 files changed, 25 insertions(+), 118 deletions(-) delete mode 100644 src/settings_ini.h diff --git a/Makefile b/Makefile index 14d2b7f77..75ae27cad 100644 --- a/Makefile +++ b/Makefile @@ -88,15 +88,12 @@ PROGS=douml \ gxmi2 \ ixmi2 -compile: src/settings_ini.h +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 -src/settings_ini.h: bin/settings.ini - ( cd bin && xxd -i settings.ini ../src/settings_ini.h; ) || exit 1 - install: mkdir -p "$(DESTDIR)$(DOUML_DIR)" if test -n "$(DOUML_ICONS_PREFIX_DIR)" ; \ diff --git a/src/dialog/EnvDialog.cpp b/src/dialog/EnvDialog.cpp index dc04d9535..bff0c0e6d 100644 --- a/src/dialog/EnvDialog.cpp +++ b/src/dialog/EnvDialog.cpp @@ -231,10 +231,11 @@ EnvDialog::EnvDialog(bool conv, bool noid) else s = codec(); - if (!s.isEmpty() && ((i = l.findIndex(s)) != -1)) - cb_charset->setCurrentItem(i); + if(s.isEmpty()) + s = "UTF-8"; - // + if((i = l.findIndex(s)) != -1) + cb_charset->setCurrentItem(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" diff --git a/src/main.cpp b/src/main.cpp index 053424c3f..eb83bdac5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -57,9 +57,7 @@ #include "ui/constructorinitializerdialog.h" #include "misc/TypeIdentifier.h" #include - #include "translate.h" -#include "settings_ini.h" bool ExitOnError = FALSE; int main(int argc, char ** argv) @@ -97,26 +95,27 @@ int main(int argc, char ** argv) factory->AddFactory(TypeIdentifier::id(), CreateLimitedDialogMenu); factory->AddConnectionFunctorQt4(TypeIdentifier::id(), ConnectToLimitedDialog); - UmlDesktop::init(); QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); settings.setIniCodec(QTextCodec::codecForName("UTF-8")); - - QFileInfo settings_info(settings.fileName()); - if(!settings_info.exists()) + QFileInfo info(settings.fileName()); + bool conv_env = !info.exists(); + if(conv_env) { - QDir settings_path(settings_info.absolutePath()); - if(!settings_path.exists()) - { - settings_path.mkpath(settings_path.absolutePath()); - } - QFile settings_file(settings_info.absoluteFilePath()); - settings_file.open(QIODevice::WriteOnly); - QByteArray data((const char *)settings_ini, settings_ini_len); - settings_file.write(data); - settings_file.close(); - EnvDialog::edit(TRUE); + settings.setIniCodec(QTextCodec::codecForName("ISO 8859-1")); + 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", QByteArray("\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6Ý\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\x1\x11\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0", 361)); + 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(); } @@ -131,10 +130,13 @@ int main(int argc, char ** argv) "To disable the mode - change compatibility_save parameter to 0 in settings.ini\n")); } + if (conv_env) + EnvDialog::edit(TRUE); + read_doumlrc(); // for virtual desktop init_pixmaps(); init_font(); - Shortcut::init(true); + Shortcut::init(conv_env); bool exec = FALSE; bool no_gui = FALSE; diff --git a/src/settings_ini.h b/src/settings_ini.h deleted file mode 100644 index 548208b75..000000000 --- a/src/settings_ini.h +++ /dev/null @@ -1,93 +0,0 @@ -unsigned char settings_ini[] = { - 0x5b, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x5d, 0x0a, 0x74, 0x65, - 0x73, 0x74, 0x3d, 0x74, 0x65, 0x73, 0x74, 0x0a, 0x0a, 0x5b, 0x4d, 0x61, - 0x69, 0x6e, 0x5d, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x61, 0x76, 0x65, 0x3d, 0x31, - 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x3d, - 0x37, 0x37, 0x0a, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x3d, - 0x55, 0x54, 0x46, 0x2d, 0x38, 0x0a, 0x0a, 0x5b, 0x46, 0x61, 0x69, 0x6c, - 0x69, 0x6e, 0x67, 0x5f, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x5d, 0x0a, 0x54, - 0x6f, 0x6f, 0x6c, 0x73, 0x3d, 0x22, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, - 0x20, 0x52, 0x6f, 0x73, 0x65, 0x2c, 0x55, 0x6d, 0x6c, 0x20, 0x70, 0x72, - 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x43, 0x2b, 0x2b, - 0x20, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x6d, 0x61, 0x63, 0x68, 0x69, - 0x6e, 0x65, 0x2c, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x20, - 0x58, 0x4d, 0x49, 0x20, 0x31, 0x2e, 0x32, 0x2c, 0x47, 0x65, 0x6e, 0x65, - 0x72, 0x61, 0x74, 0x65, 0x20, 0x2e, 0x70, 0x72, 0x6f, 0x22, 0x0a, 0x0a, - 0x5b, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5d, 0x0a, 0x71, 0x75, - 0x69, 0x63, 0x6b, 0x65, 0x64, 0x69, 0x74, 0x3d, 0x40, 0x42, 0x79, 0x74, - 0x65, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0xc3, 0xbf, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0xc3, 0x9d, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, 0xc3, 0xbf, 0xc3, 0xbf, - 0xc3, 0xbf, 0xc3, 0xbf, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0xc2, 0x81, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x37, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, - 0x31, 0x5c, 0x78, 0x31, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x22, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x3e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x37, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2b, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x4c, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x35, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x78, 0x36, 0x34, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x34, 0x32, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x64, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x32, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x78, 0x33, 0x35, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x23, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x24, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x28, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x2e, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x21, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x78, 0x34, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x2d, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x33, 0x38, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x36, 0x34, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, 0x5c, - 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, - 0x69, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x78, 0x31, 0x5c, 0x30, - 0x5c, 0x30, 0x5c, 0x30, 0x5c, 0x30, 0x29, 0x0a, 0x0a, 0x5b, 0x71, 0x75, - 0x69, 0x63, 0x6b, 0x65, 0x64, 0x69, 0x74, 0x5f, 0x63, 0x68, 0x65, 0x63, - 0x6b, 0x62, 0x6f, 0x78, 0x65, 0x73, 0x5d, 0x0a, 0x63, 0x70, 0x70, 0x3d, - 0x74, 0x72, 0x75, 0x65, 0x0a, 0x6a, 0x61, 0x76, 0x61, 0x3d, 0x66, 0x61, - 0x6c, 0x73, 0x65, 0x0a, 0x70, 0x68, 0x70, 0x3d, 0x66, 0x61, 0x6c, 0x73, - 0x65, 0x0a, 0x70, 0x79, 0x74, 0x68, 0x6f, 0x6e, 0x3d, 0x66, 0x61, 0x6c, - 0x73, 0x65, 0x0a, 0x69, 0x64, 0x6c, 0x3d, 0x66, 0x61, 0x6c, 0x73, 0x65, - 0x0a, 0x0a, 0x5b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5d, 0x0a, 0x73, - 0x69, 0x7a, 0x65, 0x3d, 0x40, 0x53, 0x69, 0x7a, 0x65, 0x28, 0x39, 0x32, - 0x37, 0x20, 0x35, 0x39, 0x35, 0x29, 0x0a -}; -unsigned int settings_ini_len = 1075; From 67f97bde2adf7831814a4d146036dd847c918758 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 19 May 2013 14:14:31 +0400 Subject: [PATCH 101/297] fix for incorrect propagation question --- src/data/OperationData.cpp | 32 +++++++++++++++++++------------- src/dialog/OperationDialog.cpp | 3 +++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/data/OperationData.cpp b/src/data/OperationData.cpp index 0ea0f7d64..bdc43548a 100644 --- a/src/data/OperationData.cpp +++ b/src/data/OperationData.cpp @@ -3969,18 +3969,24 @@ void OperationData::read(char *& st, char *& k) } bool operator==(const OperationData & origin, const OperationData & another) { - bool paramsResult = false; -// if(origin.params.isEmpty() && another.params.isEmpty()) -// paramsResult = true; -// else if(origin.params != another.params) -// { -// if(origin.params.isEmpty()) -// return false; -// else if(another.params.isEmpty() == nullptr) -// return false; -// paramsResult = *origin.params == *another.params; -// } - paramsResult = origin.params == another.params; + 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; + } + } + if(!paramsResult) return false; if(origin.uml_visibility != another.uml_visibility || @@ -4063,7 +4069,7 @@ bool PropagationEquality(const OperationData & origin, const OperationData & ano paramsResult = false; else { - int i = 0; + int i = -1; auto it = origin.params.begin(); while(it != origin.params.end()) { diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 6eca9e2ed..3ae23bf05 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -3238,6 +3238,7 @@ void OperationDialog::post_php_edit_body(OperationDialog * d, QString s) bool OperationDialog::SaveData() { + BrowserClass* containingClass = static_cast(oper->browser_node->get_container(UmlClass)); QList passedNodes; bool goBack = true; @@ -3250,6 +3251,8 @@ bool OperationDialog::SaveData() bool equals = *oper == *operCopy; bool newst = operCopy->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace())); delete operCopy; + if(equals) + return true; if(!inheritanceSiblings.isEmpty() && !equals) { From 4849b1f394d9c72e8a680ce6fe3aadc2d75e980e Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 20 May 2013 23:57:17 +0400 Subject: [PATCH 102/297] fix for unidirectional association dialog crash --- src/dialog/KeyValueTable.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/dialog/KeyValueTable.cpp b/src/dialog/KeyValueTable.cpp index 6d72ac85b..3a2c4b643 100644 --- a/src/dialog/KeyValueTable.cpp +++ b/src/dialog/KeyValueTable.cpp @@ -148,6 +148,11 @@ void KeyValuesTable::remove(const char * key) void KeyValuesTable::Init(HaveKeyValueData *kvData, bool isReadOnly) { + if(!kvData) + { + this->setEnabled(false); + return; + } AdjustColumnCount(isReadOnly); AdjustRowCount(kvData, isReadOnly); SetupTableText(kvData, isReadOnly); From 0dd3474c73c57a89545210eb0f2061a0abf67cd1 Mon Sep 17 00:00:00 2001 From: zeks Date: Tue, 21 May 2013 18:05:26 +0400 Subject: [PATCH 103/297] 1. Fixed copying of attribute (crashed on copying getters) 2. Duplicate into now duplicates INTO 3. Copying class/artifact will also copy KV table Conflicts: Makefile Conflicts: Makefile src/CppGenerator/CppRefType.cpp src/CppGenerator/UmlArtifact.cpp src/browser/BrowserNode.cpp src/browser/BrowserPackage.cpp --- src/CppGenerator/UmlPackage.cpp | 6 +- src/CppGenerator/main.cpp | 2 + src/CppGenerator/util.cpp | 366 ++++++++++++++++---------------- src/browser/BrowserClass.cpp | 11 +- src/browser/BrowserNode.cpp | 43 +++- src/browser/BrowserPackage.cpp | 3 +- 6 files changed, 234 insertions(+), 197 deletions(-) diff --git a/src/CppGenerator/UmlPackage.cpp b/src/CppGenerator/UmlPackage.cpp index fe5966872..04626e2f8 100644 --- a/src/CppGenerator/UmlPackage.cpp +++ b/src/CppGenerator/UmlPackage.cpp @@ -206,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).toAscii(); 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(); @@ -244,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).toAscii(); 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(); diff --git a/src/CppGenerator/main.cpp b/src/CppGenerator/main.cpp index 7b8c0b9b0..02519d98b 100644 --- a/src/CppGenerator/main.cpp +++ b/src/CppGenerator/main.cpp @@ -57,7 +57,9 @@ int main(int argc, char ** argv) QTextCodec::setCodecForLocale(codec); QLOG_INFO() << " STARTING CPP_GENERATOR"; + #endif + //QTest::qSleep(7000); int port_index; if (argc == 2) { diff --git a/src/CppGenerator/util.cpp b/src/CppGenerator/util.cpp index d4e77211f..fa0e0a2d3 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 -//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("
" + 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 +//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); + QByteArray temp = indent.toAscii(); + 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("
" + 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/browser/BrowserClass.cpp b/src/browser/BrowserClass.cpp index 0284d3077..3a12ba9cd 100644 --- a/src/browser/BrowserClass.cpp +++ b/src/browser/BrowserClass.cpp @@ -1252,6 +1252,7 @@ BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name) // duplicates the sub elts for (child = firstChild(); n != 0; child = child->nextSibling(), n -= 1) { + BrowserNode* nodeCopy; if (!((BrowserNode *) child)->deletedp()) { if (IsaRelation(((BrowserNode *) child)->get_type())) @@ -1260,10 +1261,16 @@ BrowserNode * BrowserClass::duplicate(BrowserNode * p, QString name) ((BrowserNode *) child)->get_data(); if ((rd->get_start_class() != this) || (rd->get_end_class() != this) || rd->is_a((BrowserRelation *) child)) - ((BrowserNode *) child)->duplicate(result); + nodeCopy = ((BrowserNode *) child)->duplicate(result); } else - ((BrowserNode *) child)->duplicate(result); + nodeCopy = ((BrowserNode *) child)->duplicate(result); + } + nodeCopy->set_n_keys(static_cast(child)->get_n_keys()); + for(int i(0); i < static_cast(child)->get_n_keys(); i++) + { + nodeCopy->set_key(i, static_cast(child)->get_key(i)); + nodeCopy->set_value(i, static_cast(child)->get_value(i)); } } diff --git a/src/browser/BrowserNode.cpp b/src/browser/BrowserNode.cpp index c46c9dea8..5e101ef9e 100644 --- a/src/browser/BrowserNode.cpp +++ b/src/browser/BrowserNode.cpp @@ -1108,19 +1108,35 @@ void BrowserNode::mark_management(int choice) if((BrowserNode *) bn->parent() != this) { BrowserNode* nodeCopy = bn->duplicate(this); - move(nodeCopy, this); + + nodeCopy->set_n_keys(bn->get_n_keys()); + for(int 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(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) { @@ -1167,7 +1183,16 @@ void BrowserNode::mark_management(int choice) for (int i = marked_list.size() - 1; i >= 0; --i) { bn = marked_list[i]; - p->move(bn->duplicate(p), this); + { + BrowserNode* nodeCopy = bn->duplicate(p); + nodeCopy->set_n_keys(bn->get_n_keys()); + for(int 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; diff --git a/src/browser/BrowserPackage.cpp b/src/browser/BrowserPackage.cpp index 38795422e..71f720087 100644 --- a/src/browser/BrowserPackage.cpp +++ b/src/browser/BrowserPackage.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include "BrowserPackage.h" @@ -1303,7 +1304,7 @@ BrowserPackage * BrowserPackage::import_project(QString fn, bool aslib, int id) bool manual = fn.isEmpty(); if (manual) { - fn = Q3FileDialog::getOpenFileName(last_used_directory(), "*.prj"); + fn = QFileDialog::getOpenFileName(last_used_directory(), "*.prj"); if (fn.isEmpty()) return 0; From 6732a5e6fe7f08314c9c535049a831e83b4c2572 Mon Sep 17 00:00:00 2001 From: zeks Date: Wed, 22 May 2013 22:31:57 +0400 Subject: [PATCH 104/297] this should fix quickedit crash From beee8eed2aea74ba9fde11880a9894f4c8891dfc Mon Sep 17 00:00:00 2001 From: Sergey Shambir Date: Sat, 25 May 2013 21:20:21 +0400 Subject: [PATCH 105/297] Genplugouts: fixed build on Linux. --- genplugouts/Xmi2Generator/Xmi2Generator.pro | 5 +++-- genplugouts/plugouts.pro | 2 +- genplugouts/usecasewizard/TabDialog.cpp | 2 +- genplugouts/xmi2import/xmi2import.pro | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/genplugouts/Xmi2Generator/Xmi2Generator.pro b/genplugouts/Xmi2Generator/Xmi2Generator.pro index acb99337f..02b5f786e 100644 --- a/genplugouts/Xmi2Generator/Xmi2Generator.pro +++ b/genplugouts/Xmi2Generator/Xmi2Generator.pro @@ -2,14 +2,15 @@ TEMPLATE = app TARGET = gxmi2 CONFIG(Debug, Debug|Release) { CONFIG -= Debug Release - CONFIG += qt warn_on Debug precompile_header + CONFIG += qt warn_on Debug QMAKE_POST_LINK = " " } CONFIG(Release, Debug|Release) { CONFIG -= Debug Release - CONFIG += qt Release precompile_header + CONFIG += qt Release QMAKE_POST_LINK = " " } +CONFIG += precompile_header DEFINES = WITHCPP WITHJAVA WITHIDL WITHPYTHON WITHPHP QMAKE_CXXFLAGS += -std=gnu++11 PRECOMPILED_HEADER += ../../src/misc/mystr.h diff --git a/genplugouts/plugouts.pro b/genplugouts/plugouts.pro index 94a496694..36bc750ef 100644 --- a/genplugouts/plugouts.pro +++ b/genplugouts/plugouts.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += BrowserSort CppUtilities Deploy FileControl GlobalChange HtmlDoc UseCaseWizard Xmi2Generator xmi2import +SUBDIRS += BrowserSort CppUtilities deploy FileControl GlobalChange HtmlDoc usecasewizard Xmi2Generator xmi2import CODECFORTR = UTF-8 CODECFORSRC = UTF-8 diff --git a/genplugouts/usecasewizard/TabDialog.cpp b/genplugouts/usecasewizard/TabDialog.cpp index 6ac76452c..793946810 100644 --- a/genplugouts/usecasewizard/TabDialog.cpp +++ b/genplugouts/usecasewizard/TabDialog.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/genplugouts/xmi2import/xmi2import.pro b/genplugouts/xmi2import/xmi2import.pro index 9a55afd2d..ba1e490a8 100644 --- a/genplugouts/xmi2import/xmi2import.pro +++ b/genplugouts/xmi2import/xmi2import.pro @@ -2,16 +2,17 @@ TEMPLATE = app TARGET = ixmi2 CONFIG(Debug, Debug|Release) { CONFIG -= Debug Release - CONFIG += qt warn_on Debug precompile_header + CONFIG += qt warn_on Debug QMAKE_POST_LINK = " " } CONFIG(Release, Debug|Release) { CONFIG -= Debug Release - CONFIG += qt Release precompile_header + CONFIG += qt Release QMAKE_POST_LINK = " " } DEFINES = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON BooL=bool PRECOMPILED_HEADER += ../../src/misc/mystr.h +CONFIG += precompile_header HEADERS = ./UmlActivityPartition.h \ ./UmlBaseNode.h \ ./UmlPackage.h \ From 87d9a06080b505b8531bb2abfdbe98187f9d13d4 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 26 May 2013 21:30:30 +0400 Subject: [PATCH 106/297] won't try to generate non working quickedit size for new .ini file --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index eb83bdac5..1628ff7ff 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -103,13 +103,13 @@ int main(int argc, char ** argv) bool conv_env = !info.exists(); if(conv_env) { - settings.setIniCodec(QTextCodec::codecForName("ISO 8859-1")); + 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", QByteArray("\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6Ý\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\x1\x11\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0", 361)); + //settings.setValue("headers/quickedit", 0); settings.setValue("quickedit_checkboxes/cpp", "true"); settings.setValue("quickedit_checkboxes/java", "false"); settings.setValue("quickedit_checkboxes/php", "false"); From ffd3a804959ea047e9b7f7fe509e3950cf15195f Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 26 May 2013 21:33:29 +0400 Subject: [PATCH 107/297] should not try to stage moc_ files now --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f00011ed0..95bdf9baa 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ include/Libs* .cproject .project .settings +src/moc_*.cpp *.log *.cppcheck *.rc From 7b2198b69852981e33889f4f831312f873b9336d Mon Sep 17 00:00:00 2001 From: zeks Date: Mon, 27 May 2013 14:05:36 +0400 Subject: [PATCH 108/297] fixed save of KV table when it's the only thing that's changed in the operation dialog --- src/data/HaveKeyValueData.cpp | 430 +++++++++++++++++---------------- src/data/HaveKeyValueData.h | 146 +++++------ src/dialog/KeyValueTable.cpp | 31 ++- src/dialog/KeyValueTable.h | 3 + src/dialog/OperationDialog.cpp | 5 +- 5 files changed, 324 insertions(+), 291 deletions(-) diff --git a/src/data/HaveKeyValueData.cpp b/src/data/HaveKeyValueData.cpp index e9b69215f..caece0b0e 100644 --- a/src/data/HaveKeyValueData.cpp +++ b/src/data/HaveKeyValueData.cpp @@ -1,214 +1,216 @@ -// ************************************************************************* -// -// 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 - -#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 + +#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); +} + + diff --git a/src/data/HaveKeyValueData.h b/src/data/HaveKeyValueData.h index f82cf5d79..75b22df1f 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 -//Added by qt3to4: -#include - -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 +//Added by qt3to4: +#include + +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 diff --git a/src/dialog/KeyValueTable.cpp b/src/dialog/KeyValueTable.cpp index 3a2c4b643..2ee60427d 100644 --- a/src/dialog/KeyValueTable.cpp +++ b/src/dialog/KeyValueTable.cpp @@ -146,17 +146,44 @@ void KeyValuesTable::remove(const char * key) } } +bool KeyValuesTable::EqualData(HaveKeyValueData * kvData) +{ + if(!kvData) + return false; + unsigned n = numRows(); + + 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) + { + 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; +} + +//bool HaveKeyValueData::isSame(KeyValueData * kvData) +//{ + +//} void KeyValuesTable::Init(HaveKeyValueData *kvData, bool isReadOnly) { if(!kvData) { - this->setEnabled(false); + //this->setEnabled(false); return; } AdjustColumnCount(isReadOnly); AdjustRowCount(kvData, isReadOnly); SetupTableText(kvData, isReadOnly); - AdjustEditability(isReadOnly); + //AdjustEditability(isReadOnly); } void KeyValuesTable::SetupTableText(HaveKeyValueData *kvData, bool isReadOnly) diff --git a/src/dialog/KeyValueTable.h b/src/dialog/KeyValueTable.h index 73cc8aec8..620b80da5 100644 --- a/src/dialog/KeyValueTable.h +++ b/src/dialog/KeyValueTable.h @@ -46,6 +46,7 @@ class KeyValuesTable : public StringTable bool get_value(const char * key, QString & value); void remove(const char * key); + bool EqualData(HaveKeyValueData*); private: void Init(HaveKeyValueData * h, bool isReadOnly); @@ -55,6 +56,8 @@ class KeyValuesTable : public StringTable void AdjustEditability(bool); QHash props; QHash colNames; + + }; #endif diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 3c79c6033..cce9056d3 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -3247,7 +3247,7 @@ bool OperationDialog::SaveData() OperationData* operCopy = new OperationData(oper, (BrowserOperation*)oper->get_browser_node()); SaveData(operCopy); - bool equals = *oper == *operCopy; + bool equals = *oper == *operCopy && kvtable->EqualData(static_cast(oper->browser_node)); bool newst = operCopy->set_stereotype(fromUnicode(edstereotype->currentText().stripWhiteSpace())); delete operCopy; if(equals) @@ -3287,9 +3287,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); From 8a92aee8aa75ca5ec030fcc74f7f2c4572c082ca Mon Sep 17 00:00:00 2001 From: pasgui Date: Sun, 16 Jun 2013 22:13:00 +0200 Subject: [PATCH 109/297] fixes roundtrip C++ bodies --- src/RoundtripBody/UmlOperation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/RoundtripBody/UmlOperation.cpp b/src/RoundtripBody/UmlOperation.cpp index 28ecaa8ab..6fb7d81d2 100644 --- a/src/RoundtripBody/UmlOperation.cpp +++ b/src/RoundtripBody/UmlOperation.cpp @@ -37,10 +37,10 @@ #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 "; +const char * BodyPrefix = "// Douml preserved body begin "; +const char * BodyPostfix = "// Douml preserved body end "; +const char * BodyPythonPrefix = "## Douml preserved body begin "; +const char * BodyPythonPostfix = "## Douml preserved body end "; const int BodyPrefixLength = 30; const int BodyPostfixLength = 28; From a355b2ab154e9f897ada16873192797b1a787ff8 Mon Sep 17 00:00:00 2001 From: Zeks Date: Sat, 22 Jun 2013 21:53:32 +0400 Subject: [PATCH 110/297] operation dialog won't crash on application exit --- .gitignore | 1 + src/dialog/OperationDialog.cpp | 16 +- src/dialog/OperationDialog.h | 4 +- src/moc_ActivityActionCanvas.cpp | 99 --- src/moc_ActivityActionData.cpp | 94 -- src/moc_ActivityActionDialog.cpp | 575 ------------ src/moc_ActivityCanvas.cpp | 98 --- src/moc_ActivityData.cpp | 94 -- src/moc_ActivityDiagramView.cpp | 81 -- src/moc_ActivityDiagramWindow.cpp | 143 --- src/moc_ActivityDialog.cpp | 105 --- src/moc_ActivityNodeCanvas.cpp | 98 --- src/moc_ActivityObjectCanvas.cpp | 99 --- src/moc_ActivityObjectData.cpp | 96 -- src/moc_ActivityObjectDialog.cpp | 110 --- src/moc_ActivityPartitionCanvas.cpp | 99 --- src/moc_ActivityPartitionDialog.cpp | 103 --- src/moc_ActualParamData.cpp | 94 -- src/moc_AnnotationDialog.cpp | 96 -- src/moc_ArrowCanvas.cpp | 101 --- src/moc_ArrowJunctionCanvas.cpp | 99 --- src/moc_ArtifactCanvas.cpp | 98 --- src/moc_ArtifactData.cpp | 94 -- src/moc_ArtifactDialog.cpp | 186 ---- src/moc_AttributeData.cpp | 97 -- src/moc_AttributeDialog.cpp | 160 ---- src/moc_BasicData.cpp | 115 --- src/moc_BasicDialog.cpp | 99 --- src/moc_BodyDialog.cpp | 81 -- src/moc_BrowserSearchDialog.cpp | 107 --- src/moc_BrowserView.cpp | 146 --- src/moc_CdClassCanvas.cpp | 100 --- src/moc_ClassData.cpp | 107 --- src/moc_ClassDiagramWindow.cpp | 132 --- src/moc_ClassDialog.cpp | 306 ------- src/moc_ClassInstanceData.cpp | 96 -- src/moc_ClassInstanceDialog.cpp | 179 ---- src/moc_ClassMemberData.cpp | 81 -- src/moc_ClassSettingsDialog.cpp | 96 -- src/moc_ClassViewDialog.cpp | 100 --- src/moc_ClipboardManager.cpp | 108 --- src/moc_CodAddMsgDialog.cpp | 99 --- src/moc_CodChangeMsgDialog.cpp | 99 --- src/moc_CodClassInstCanvas.cpp | 100 --- src/moc_CodDirsCanvas.cpp | 100 --- src/moc_CodSelfLinkCanvas.cpp | 100 --- src/moc_ColDiagramWindow.cpp | 116 --- src/moc_ColMsgTable.cpp | 94 -- src/moc_ComponentCanvas.cpp | 100 --- src/moc_ComponentDiagramView.cpp | 81 -- src/moc_ComponentDiagramWindow.cpp | 118 --- src/moc_ComponentDialog.cpp | 125 --- src/moc_ConstraintCanvas.cpp | 94 -- src/moc_ConstraintDialog.cpp | 177 ---- src/moc_ContinuationDialog.cpp | 96 -- src/moc_DecoratorDialog.cpp | 96 -- src/moc_DeploymentDiagramView.cpp | 81 -- src/moc_DeploymentDiagramWindow.cpp | 126 --- src/moc_DeploymentNodeCanvas.cpp | 101 --- src/moc_DiagramView.cpp | 104 --- src/moc_DiagramWindow.cpp | 105 --- src/moc_DialogTimer.cpp | 94 -- src/moc_EdgeMenuDialog.cpp | 147 ---- src/moc_EdgeMenuFactory.cpp | 94 -- src/moc_EdgeMenuToolBar.cpp | 135 --- src/moc_EnvDialog.cpp | 108 --- src/moc_ExpansionNodeCanvas.cpp | 99 --- src/moc_ExpansionRegionCanvas.cpp | 99 --- src/moc_ExpansionRegionDialog.cpp | 101 --- src/moc_ExtraMemberData.cpp | 81 -- src/moc_ExtraMemberDialog.cpp | 114 --- src/moc_FlowCanvas.cpp | 96 -- src/moc_FlowData.cpp | 94 -- src/moc_FlowDialog.cpp | 123 --- src/moc_FormalParamData.cpp | 97 -- src/moc_FragmentCanvas.cpp | 96 -- src/moc_FragmentDialog.cpp | 99 --- src/moc_GenerationSettingsBuiltinTable.cpp | 111 --- src/moc_GenerationSettingsDialog.cpp | 160 ---- src/moc_GreetingsDialog.cpp | 96 -- src/moc_HelpDialog.cpp | 81 -- src/moc_HelpRegexpDialog.cpp | 81 -- src/moc_HideShowDialog.cpp | 111 --- src/moc_IconCanvas.cpp | 96 -- src/moc_ImageDialog.cpp | 101 --- src/moc_InstanceDialog.cpp | 99 --- src/moc_InterruptibleActivityRegionCanvas.cpp | 99 --- src/moc_MLEDialog.cpp | 81 -- src/moc_MultiPurposeDragArea.cpp | 146 --- src/moc_MyInputDialog.cpp | 96 -- src/moc_MyTable.cpp | 81 -- src/moc_NoteCanvas.cpp | 96 -- src/moc_ObjectDiagramWindow.cpp | 113 --- src/moc_ObjectLinkCanvas.cpp | 96 -- src/moc_ObjectLinkDialog.cpp | 101 --- src/moc_OdClassInstCanvas.cpp | 100 --- src/moc_OperationData.cpp | 98 --- src/moc_OperationDialog.cpp | 832 ------------------ src/moc_PackageCanvas.cpp | 98 --- src/moc_PackageDialog.cpp | 132 --- src/moc_ParameterCanvas.cpp | 98 --- src/moc_ParameterData.cpp | 96 -- src/moc_ParameterDialog.cpp | 113 --- src/moc_ParameterSetCanvas.cpp | 101 --- src/moc_ParameterSetData.cpp | 94 -- src/moc_ParameterSetDialog.cpp | 105 --- src/moc_PinCanvas.cpp | 98 --- src/moc_PinDialog.cpp | 110 --- src/moc_PseudoStateCanvas.cpp | 98 --- src/moc_PseudoStateData.cpp | 94 -- src/moc_PseudoStateDialog.cpp | 101 --- src/moc_ReferenceDialog.cpp | 107 --- src/moc_RelatedElementsDialog.cpp | 97 -- src/moc_RelationCanvas.cpp | 102 --- src/moc_RelationData.cpp | 98 --- src/moc_RelationDialog.cpp | 210 ----- src/moc_RevSettingsDialog.cpp | 99 --- src/moc_SdClassInstCanvas.cpp | 100 --- src/moc_SdContinuationCanvas.cpp | 96 -- src/moc_SdDurationCanvas.cpp | 98 --- src/moc_SdMsgBaseCanvas.cpp | 96 -- src/moc_SdMsgDialog.cpp | 99 --- src/moc_SeqDiagramWindow.cpp | 136 --- src/moc_Settings.cpp | 100 --- src/moc_SettingsDialog.cpp | 99 --- src/moc_ShortcutDialog.cpp | 173 ---- src/moc_SimpleData.cpp | 81 -- src/moc_SimpleRelationCanvas.cpp | 97 -- src/moc_SimpleRelationData.cpp | 94 -- src/moc_SimpleRelationDialog.cpp | 99 --- src/moc_Socket.cpp | 94 -- src/moc_SourceDialog.cpp | 177 ---- src/moc_StateActionCanvas.cpp | 98 --- src/moc_StateActionDialog.cpp | 100 --- src/moc_StateCanvas.cpp | 100 --- src/moc_StateData.cpp | 94 -- src/moc_StateDiagramView.cpp | 81 -- src/moc_StateDiagramWindow.cpp | 147 ---- src/moc_StateDialog.cpp | 130 --- src/moc_StereotypeDialog.cpp | 96 -- src/moc_StereotypePropertiesCanvas.cpp | 94 -- src/moc_StereotypesDialog.cpp | 96 -- src/moc_StringTable.cpp | 97 -- src/moc_SubjectCanvas.cpp | 96 -- src/moc_ToolCom.cpp | 107 --- src/moc_ToolDialog.cpp | 170 ---- src/moc_TraceDialog.cpp | 96 -- src/moc_TransitionCanvas.cpp | 96 -- src/moc_TransitionData.cpp | 94 -- src/moc_TransitionDialog.cpp | 123 --- src/moc_UcClassCanvas.cpp | 98 --- src/moc_UcUseCaseCanvas.cpp | 98 --- src/moc_UmlCanvas.cpp | 94 -- src/moc_UmlWindow.cpp | 295 ------- src/moc_UseCaseData.cpp | 81 -- src/moc_UseCaseDiagramView.cpp | 81 -- src/moc_UseCaseDiagramWindow.cpp | 124 --- src/moc_UseCaseDialog.cpp | 99 --- src/moc_catalogwidget.cpp | 146 --- src/moc_constructorinitializerdialog.cpp | 95 -- src/moc_edgemenudialogqt4.cpp | 144 --- src/moc_operationwidgetcpp.cpp | 81 -- src/moc_quickedit.cpp | 126 --- 163 files changed, 7 insertions(+), 18617 deletions(-) delete mode 100644 src/moc_ActivityActionCanvas.cpp delete mode 100644 src/moc_ActivityActionData.cpp delete mode 100644 src/moc_ActivityActionDialog.cpp delete mode 100644 src/moc_ActivityCanvas.cpp delete mode 100644 src/moc_ActivityData.cpp delete mode 100644 src/moc_ActivityDiagramView.cpp delete mode 100644 src/moc_ActivityDiagramWindow.cpp delete mode 100644 src/moc_ActivityDialog.cpp delete mode 100644 src/moc_ActivityNodeCanvas.cpp delete mode 100644 src/moc_ActivityObjectCanvas.cpp delete mode 100644 src/moc_ActivityObjectData.cpp delete mode 100644 src/moc_ActivityObjectDialog.cpp delete mode 100644 src/moc_ActivityPartitionCanvas.cpp delete mode 100644 src/moc_ActivityPartitionDialog.cpp delete mode 100644 src/moc_ActualParamData.cpp delete mode 100644 src/moc_AnnotationDialog.cpp delete mode 100644 src/moc_ArrowCanvas.cpp delete mode 100644 src/moc_ArrowJunctionCanvas.cpp delete mode 100644 src/moc_ArtifactCanvas.cpp delete mode 100644 src/moc_ArtifactData.cpp delete mode 100644 src/moc_ArtifactDialog.cpp delete mode 100644 src/moc_AttributeData.cpp delete mode 100644 src/moc_AttributeDialog.cpp delete mode 100644 src/moc_BasicData.cpp delete mode 100644 src/moc_BasicDialog.cpp delete mode 100644 src/moc_BodyDialog.cpp delete mode 100644 src/moc_BrowserSearchDialog.cpp delete mode 100644 src/moc_BrowserView.cpp delete mode 100644 src/moc_CdClassCanvas.cpp delete mode 100644 src/moc_ClassData.cpp delete mode 100644 src/moc_ClassDiagramWindow.cpp delete mode 100644 src/moc_ClassDialog.cpp delete mode 100644 src/moc_ClassInstanceData.cpp delete mode 100644 src/moc_ClassInstanceDialog.cpp delete mode 100644 src/moc_ClassMemberData.cpp delete mode 100644 src/moc_ClassSettingsDialog.cpp delete mode 100644 src/moc_ClassViewDialog.cpp delete mode 100644 src/moc_ClipboardManager.cpp delete mode 100644 src/moc_CodAddMsgDialog.cpp delete mode 100644 src/moc_CodChangeMsgDialog.cpp delete mode 100644 src/moc_CodClassInstCanvas.cpp delete mode 100644 src/moc_CodDirsCanvas.cpp delete mode 100644 src/moc_CodSelfLinkCanvas.cpp delete mode 100644 src/moc_ColDiagramWindow.cpp delete mode 100644 src/moc_ColMsgTable.cpp delete mode 100644 src/moc_ComponentCanvas.cpp delete mode 100644 src/moc_ComponentDiagramView.cpp delete mode 100644 src/moc_ComponentDiagramWindow.cpp delete mode 100644 src/moc_ComponentDialog.cpp delete mode 100644 src/moc_ConstraintCanvas.cpp delete mode 100644 src/moc_ConstraintDialog.cpp delete mode 100644 src/moc_ContinuationDialog.cpp delete mode 100644 src/moc_DecoratorDialog.cpp delete mode 100644 src/moc_DeploymentDiagramView.cpp delete mode 100644 src/moc_DeploymentDiagramWindow.cpp delete mode 100644 src/moc_DeploymentNodeCanvas.cpp delete mode 100644 src/moc_DiagramView.cpp delete mode 100644 src/moc_DiagramWindow.cpp delete mode 100644 src/moc_DialogTimer.cpp delete mode 100644 src/moc_EdgeMenuDialog.cpp delete mode 100644 src/moc_EdgeMenuFactory.cpp delete mode 100644 src/moc_EdgeMenuToolBar.cpp delete mode 100644 src/moc_EnvDialog.cpp delete mode 100644 src/moc_ExpansionNodeCanvas.cpp delete mode 100644 src/moc_ExpansionRegionCanvas.cpp delete mode 100644 src/moc_ExpansionRegionDialog.cpp delete mode 100644 src/moc_ExtraMemberData.cpp delete mode 100644 src/moc_ExtraMemberDialog.cpp delete mode 100644 src/moc_FlowCanvas.cpp delete mode 100644 src/moc_FlowData.cpp delete mode 100644 src/moc_FlowDialog.cpp delete mode 100644 src/moc_FormalParamData.cpp delete mode 100644 src/moc_FragmentCanvas.cpp delete mode 100644 src/moc_FragmentDialog.cpp delete mode 100644 src/moc_GenerationSettingsBuiltinTable.cpp delete mode 100644 src/moc_GenerationSettingsDialog.cpp delete mode 100644 src/moc_GreetingsDialog.cpp delete mode 100644 src/moc_HelpDialog.cpp delete mode 100644 src/moc_HelpRegexpDialog.cpp delete mode 100644 src/moc_HideShowDialog.cpp delete mode 100644 src/moc_IconCanvas.cpp delete mode 100644 src/moc_ImageDialog.cpp delete mode 100644 src/moc_InstanceDialog.cpp delete mode 100644 src/moc_InterruptibleActivityRegionCanvas.cpp delete mode 100644 src/moc_MLEDialog.cpp delete mode 100644 src/moc_MultiPurposeDragArea.cpp delete mode 100644 src/moc_MyInputDialog.cpp delete mode 100644 src/moc_MyTable.cpp delete mode 100644 src/moc_NoteCanvas.cpp delete mode 100644 src/moc_ObjectDiagramWindow.cpp delete mode 100644 src/moc_ObjectLinkCanvas.cpp delete mode 100644 src/moc_ObjectLinkDialog.cpp delete mode 100644 src/moc_OdClassInstCanvas.cpp delete mode 100644 src/moc_OperationData.cpp delete mode 100644 src/moc_OperationDialog.cpp delete mode 100644 src/moc_PackageCanvas.cpp delete mode 100644 src/moc_PackageDialog.cpp delete mode 100644 src/moc_ParameterCanvas.cpp delete mode 100644 src/moc_ParameterData.cpp delete mode 100644 src/moc_ParameterDialog.cpp delete mode 100644 src/moc_ParameterSetCanvas.cpp delete mode 100644 src/moc_ParameterSetData.cpp delete mode 100644 src/moc_ParameterSetDialog.cpp delete mode 100644 src/moc_PinCanvas.cpp delete mode 100644 src/moc_PinDialog.cpp delete mode 100644 src/moc_PseudoStateCanvas.cpp delete mode 100644 src/moc_PseudoStateData.cpp delete mode 100644 src/moc_PseudoStateDialog.cpp delete mode 100644 src/moc_ReferenceDialog.cpp delete mode 100644 src/moc_RelatedElementsDialog.cpp delete mode 100644 src/moc_RelationCanvas.cpp delete mode 100644 src/moc_RelationData.cpp delete mode 100644 src/moc_RelationDialog.cpp delete mode 100644 src/moc_RevSettingsDialog.cpp delete mode 100644 src/moc_SdClassInstCanvas.cpp delete mode 100644 src/moc_SdContinuationCanvas.cpp delete mode 100644 src/moc_SdDurationCanvas.cpp delete mode 100644 src/moc_SdMsgBaseCanvas.cpp delete mode 100644 src/moc_SdMsgDialog.cpp delete mode 100644 src/moc_SeqDiagramWindow.cpp delete mode 100644 src/moc_Settings.cpp delete mode 100644 src/moc_SettingsDialog.cpp delete mode 100644 src/moc_ShortcutDialog.cpp delete mode 100644 src/moc_SimpleData.cpp delete mode 100644 src/moc_SimpleRelationCanvas.cpp delete mode 100644 src/moc_SimpleRelationData.cpp delete mode 100644 src/moc_SimpleRelationDialog.cpp delete mode 100644 src/moc_Socket.cpp delete mode 100644 src/moc_SourceDialog.cpp delete mode 100644 src/moc_StateActionCanvas.cpp delete mode 100644 src/moc_StateActionDialog.cpp delete mode 100644 src/moc_StateCanvas.cpp delete mode 100644 src/moc_StateData.cpp delete mode 100644 src/moc_StateDiagramView.cpp delete mode 100644 src/moc_StateDiagramWindow.cpp delete mode 100644 src/moc_StateDialog.cpp delete mode 100644 src/moc_StereotypeDialog.cpp delete mode 100644 src/moc_StereotypePropertiesCanvas.cpp delete mode 100644 src/moc_StereotypesDialog.cpp delete mode 100644 src/moc_StringTable.cpp delete mode 100644 src/moc_SubjectCanvas.cpp delete mode 100644 src/moc_ToolCom.cpp delete mode 100644 src/moc_ToolDialog.cpp delete mode 100644 src/moc_TraceDialog.cpp delete mode 100644 src/moc_TransitionCanvas.cpp delete mode 100644 src/moc_TransitionData.cpp delete mode 100644 src/moc_TransitionDialog.cpp delete mode 100644 src/moc_UcClassCanvas.cpp delete mode 100644 src/moc_UcUseCaseCanvas.cpp delete mode 100644 src/moc_UmlCanvas.cpp delete mode 100644 src/moc_UmlWindow.cpp delete mode 100644 src/moc_UseCaseData.cpp delete mode 100644 src/moc_UseCaseDiagramView.cpp delete mode 100644 src/moc_UseCaseDiagramWindow.cpp delete mode 100644 src/moc_UseCaseDialog.cpp delete mode 100644 src/moc_catalogwidget.cpp delete mode 100644 src/moc_constructorinitializerdialog.cpp delete mode 100644 src/moc_edgemenudialogqt4.cpp delete mode 100644 src/moc_operationwidgetcpp.cpp delete mode 100644 src/moc_quickedit.cpp diff --git a/.gitignore b/.gitignore index 95bdf9baa..53d5b86f8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.pro.user *.o *moc_* +src/moc_* *.rar debug/* release/* diff --git a/src/dialog/OperationDialog.cpp b/src/dialog/OperationDialog.cpp index 3ae23bf05..7f07ffad2 100644 --- a/src/dialog/OperationDialog.cpp +++ b/src/dialog/OperationDialog.cpp @@ -87,7 +87,6 @@ #include "browserfunctions/operationfuncs.h" QSize OperationDialog::previous_size; -QSharedPointer OperationDialog::instance; OperationDialog::OperationDialog(OperationData * o, DrawingLanguage ) : EdgeMenuDialog(0, 0, FALSE), oper(o), cl((ClassData *)((BrowserClass *) o->browser_node->parent())->get_data()) @@ -7342,18 +7341,11 @@ uint OperationDialog::TypeID() return TypeIdentifier::id(); } -QSharedPointer OperationDialog::Instance(OperationData * o, DrawingLanguage l) +OperationDialog* OperationDialog::Instance(OperationData * o, DrawingLanguage l) { - if (instance.isNull()) - instance = QSharedPointer(new OperationDialog(o, l)); - else { - instance->drawingLanguage = l; - instance->ChangeTab(0); - instance->FillGuiElements(o); - - } - - return instance; + OperationDialog* dialog = new OperationDialog(o, l); + dialog->setWindowFlags(Qt::WDestructiveClose); + return dialog; } void OperationDialog::InitPropertiesTab() diff --git a/src/dialog/OperationDialog.h b/src/dialog/OperationDialog.h index 762fe794e..226d18cb2 100644 --- a/src/dialog/OperationDialog.h +++ b/src/dialog/OperationDialog.h @@ -233,7 +233,7 @@ class OperationDialog : public EdgeMenuDialog DrawingLanguage drawingLanguage; - static QSharedPointer instance; + //static QSharedPointer instance; protected: @@ -305,7 +305,7 @@ 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 Instance(OperationData * , DrawingLanguage l); + static OperationDialog *Instance(OperationData * , DrawingLanguage l); protected slots: virtual void polish(); diff --git a/src/moc_ActivityActionCanvas.cpp b/src/moc_ActivityActionCanvas.cpp deleted file mode 100644 index 382424d90..000000000 --- a/src/moc_ActivityActionCanvas.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityActionCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ActivityActionCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityActionCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityActionCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x08, - 33, 21, 21, 21, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityActionCanvas[] = { - "ActivityActionCanvas\0\0modified()\0" - "deleted()\0" -}; - -void ActivityActionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityActionCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityActionCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityActionCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ActivityActionCanvas, - qt_meta_data_ActivityActionCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityActionCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityActionCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityActionCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityActionCanvas)) - return static_cast(const_cast< ActivityActionCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ActivityActionCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ActivityActionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityActionData.cpp b/src/moc_ActivityActionData.cpp deleted file mode 100644 index e339e1fed..000000000 --- a/src/moc_ActivityActionData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityActionData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ActivityActionData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityActionData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityActionData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityActionData[] = { - "ActivityActionData\0\0depend_deleted()\0" -}; - -void ActivityActionData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityActionData *_t = static_cast(_o); - switch (_id) { - case 0: _t->depend_deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityActionData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityActionData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_ActivityActionData, - qt_meta_data_ActivityActionData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityActionData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityActionData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityActionData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityActionData)) - return static_cast(const_cast< ActivityActionData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int ActivityActionData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityActionDialog.cpp b/src/moc_ActivityActionDialog.cpp deleted file mode 100644 index bc7223640..000000000 --- a/src/moc_ActivityActionDialog.cpp +++ /dev/null @@ -1,575 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityActionDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ActivityActionDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityActionDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_OpaqueDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x09, - 25, 13, 13, 13, 0x09, - 36, 13, 13, 13, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_OpaqueDialog[] = { - "OpaqueDialog\0\0edit_ocl()\0edit_cpp()\0" - "edit_java()\0" -}; - -void OpaqueDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - OpaqueDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->edit_ocl(); break; - case 1: _t->edit_cpp(); break; - case 2: _t->edit_java(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData OpaqueDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject OpaqueDialog::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_OpaqueDialog, - qt_meta_data_OpaqueDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &OpaqueDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *OpaqueDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *OpaqueDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_OpaqueDialog)) - return static_cast(const_cast< OpaqueDialog*>(this)); - if (!strcmp(_clname, "AnyActionDialog")) - return static_cast< AnyActionDialog*>(const_cast< OpaqueDialog*>(this)); - return QObject::qt_metacast(_clname); -} - -int OpaqueDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -static const uint qt_meta_data_AccessVariableValueDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 27, 26, 26, 26, 0x09, - 45, 26, 26, 26, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_AccessVariableValueDialog[] = { - "AccessVariableValueDialog\0\0classChanged(int)\0" - "menu_var()\0" -}; - -void AccessVariableValueDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - AccessVariableValueDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->classChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 1: _t->menu_var(); break; - default: ; - } - } -} - -const QMetaObjectExtraData AccessVariableValueDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject AccessVariableValueDialog::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_AccessVariableValueDialog, - qt_meta_data_AccessVariableValueDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &AccessVariableValueDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *AccessVariableValueDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *AccessVariableValueDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_AccessVariableValueDialog)) - return static_cast(const_cast< AccessVariableValueDialog*>(this)); - if (!strcmp(_clname, "AnyActionDialog")) - return static_cast< AnyActionDialog*>(const_cast< AccessVariableValueDialog*>(this)); - return QObject::qt_metacast(_clname); -} - -int AccessVariableValueDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_CallBehaviorDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_CallBehaviorDialog[] = { - "CallBehaviorDialog\0\0menu_beh()\0" -}; - -void CallBehaviorDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CallBehaviorDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->menu_beh(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CallBehaviorDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CallBehaviorDialog::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_CallBehaviorDialog, - qt_meta_data_CallBehaviorDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CallBehaviorDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CallBehaviorDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CallBehaviorDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CallBehaviorDialog)) - return static_cast(const_cast< CallBehaviorDialog*>(this)); - if (!strcmp(_clname, "WithBehaviorDialog")) - return static_cast< WithBehaviorDialog*>(const_cast< CallBehaviorDialog*>(this)); - return QObject::qt_metacast(_clname); -} - -int CallBehaviorDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -static const uint qt_meta_data_CallOperationDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 20, 20, 20, 0x09, - 39, 20, 20, 20, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_CallOperationDialog[] = { - "CallOperationDialog\0\0classChanged(int)\0" - "menu_oper()\0" -}; - -void CallOperationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CallOperationDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->classChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 1: _t->menu_oper(); break; - default: ; - } - } -} - -const QMetaObjectExtraData CallOperationDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CallOperationDialog::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_CallOperationDialog, - qt_meta_data_CallOperationDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CallOperationDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CallOperationDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CallOperationDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CallOperationDialog)) - return static_cast(const_cast< CallOperationDialog*>(this)); - if (!strcmp(_clname, "AnyActionDialog")) - return static_cast< AnyActionDialog*>(const_cast< CallOperationDialog*>(this)); - return QObject::qt_metacast(_clname); -} - -int CallOperationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_ValueSpecificationDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 26, 25, 25, 25, 0x09, - 37, 25, 25, 25, 0x09, - 48, 25, 25, 25, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ValueSpecificationDialog[] = { - "ValueSpecificationDialog\0\0edit_ocl()\0" - "edit_cpp()\0edit_java()\0" -}; - -void ValueSpecificationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ValueSpecificationDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->edit_ocl(); break; - case 1: _t->edit_cpp(); break; - case 2: _t->edit_java(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ValueSpecificationDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ValueSpecificationDialog::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ValueSpecificationDialog, - qt_meta_data_ValueSpecificationDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ValueSpecificationDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ValueSpecificationDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ValueSpecificationDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ValueSpecificationDialog)) - return static_cast(const_cast< ValueSpecificationDialog*>(this)); - if (!strcmp(_clname, "AnyActionDialog")) - return static_cast< AnyActionDialog*>(const_cast< ValueSpecificationDialog*>(this)); - return QObject::qt_metacast(_clname); -} - -int ValueSpecificationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -static const uint qt_meta_data_ReduceDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_ReduceDialog[] = { - "ReduceDialog\0\0menu_beh()\0" -}; - -void ReduceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ReduceDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->menu_beh(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ReduceDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ReduceDialog::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ReduceDialog, - qt_meta_data_ReduceDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ReduceDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ReduceDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ReduceDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ReduceDialog)) - return static_cast(const_cast< ReduceDialog*>(this)); - if (!strcmp(_clname, "WithBehaviorDialog")) - return static_cast< WithBehaviorDialog*>(const_cast< ReduceDialog*>(this)); - return QObject::qt_metacast(_clname); -} - -int ReduceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -static const uint qt_meta_data_ActivityActionDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x09, - 31, 21, 21, 21, 0x09, - 40, 21, 21, 21, 0x09, - 61, 21, 21, 21, 0x09, - 80, 21, 21, 21, 0x09, - 98, 21, 21, 21, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityActionDialog[] = { - "ActivityActionDialog\0\0polish()\0accept()\0" - "edTypeActivated(int)\0edit_description()\0" - "edit_constraint()\0change_tabs(QWidget*)\0" -}; - -void ActivityActionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityActionDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edTypeActivated((*reinterpret_cast< int(*)>(_a[1]))); break; - case 3: _t->edit_description(); break; - case 4: _t->edit_constraint(); break; - case 5: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ActivityActionDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityActionDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityActionDialog, - qt_meta_data_ActivityActionDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityActionDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityActionDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityActionDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityActionDialog)) - return static_cast(const_cast< ActivityActionDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ActivityActionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) - qt_static_metacall(this, _c, _id, _a); - _id -= 6; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityCanvas.cpp b/src/moc_ActivityCanvas.cpp deleted file mode 100644 index a2a21b720..000000000 --- a/src/moc_ActivityCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ActivityCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x08, - 27, 15, 15, 15, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityCanvas[] = { - "ActivityCanvas\0\0modified()\0deleted()\0" -}; - -void ActivityCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ActivityCanvas, - qt_meta_data_ActivityCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityCanvas)) - return static_cast(const_cast< ActivityCanvas*>(this)); - if (!strcmp(_clname, "ActivityContainerCanvas")) - return static_cast< ActivityContainerCanvas*>(const_cast< ActivityCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ActivityCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityData.cpp b/src/moc_ActivityData.cpp deleted file mode 100644 index b35993e8e..000000000 --- a/src/moc_ActivityData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ActivityData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityData[] = { - "ActivityData\0\0on_delete()\0" -}; - -void ActivityData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_ActivityData, - qt_meta_data_ActivityData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityData)) - return static_cast(const_cast< ActivityData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int ActivityData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityDiagramView.cpp b/src/moc_ActivityDiagramView.cpp deleted file mode 100644 index 1d98a7b1f..000000000 --- a/src/moc_ActivityDiagramView.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityDiagramView.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ActivityDiagramView.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityDiagramView.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityDiagramView[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityDiagramView[] = { - "ActivityDiagramView\0" -}; - -void ActivityDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityDiagramView::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityDiagramView::staticMetaObject = { - { &DiagramView::staticMetaObject, qt_meta_stringdata_ActivityDiagramView, - qt_meta_data_ActivityDiagramView, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityDiagramView::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityDiagramView::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityDiagramView::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityDiagramView)) - return static_cast(const_cast< ActivityDiagramView*>(this)); - return DiagramView::qt_metacast(_clname); -} - -int ActivityDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramView::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityDiagramWindow.cpp b/src/moc_ActivityDiagramWindow.cpp deleted file mode 100644 index 34ad58ec7..000000000 --- a/src/moc_ActivityDiagramWindow.cpp +++ /dev/null @@ -1,143 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ActivityDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 21, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 23, 22, 22, 22, 0x09, - 38, 22, 22, 22, 0x09, - 72, 22, 22, 22, 0x09, - 94, 22, 22, 22, 0x09, - 118, 22, 22, 22, 0x09, - 132, 22, 22, 22, 0x09, - 152, 22, 22, 22, 0x09, - 168, 22, 22, 22, 0x09, - 183, 22, 22, 22, 0x09, - 195, 22, 22, 22, 0x09, - 206, 22, 22, 22, 0x09, - 217, 22, 22, 22, 0x09, - 230, 22, 22, 22, 0x09, - 243, 22, 22, 22, 0x09, - 254, 22, 22, 22, 0x09, - 271, 22, 22, 22, 0x09, - 285, 22, 22, 22, 0x09, - 300, 22, 22, 22, 0x09, - 311, 22, 22, 22, 0x09, - 324, 22, 22, 22, 0x09, - 335, 22, 22, 22, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityDiagramWindow[] = { - "ActivityDiagramWindow\0\0hit_activity()\0" - "hit_interruptibleactivityregion()\0" - "hit_expansionregion()\0hit_activitypartition()\0" - "hit_initial()\0hit_activityfinal()\0" - "hit_flowfinal()\0hit_decision()\0" - "hit_merge()\0hit_fork()\0hit_join()\0" - "hit_action()\0hit_object()\0hit_flow()\0" - "hit_dependency()\0hit_package()\0" - "hit_fragment()\0hit_note()\0hit_anchor()\0" - "hit_text()\0hit_image()\0" -}; - -void ActivityDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_activity(); break; - case 1: _t->hit_interruptibleactivityregion(); break; - case 2: _t->hit_expansionregion(); break; - case 3: _t->hit_activitypartition(); break; - case 4: _t->hit_initial(); break; - case 5: _t->hit_activityfinal(); break; - case 6: _t->hit_flowfinal(); break; - case 7: _t->hit_decision(); break; - case 8: _t->hit_merge(); break; - case 9: _t->hit_fork(); break; - case 10: _t->hit_join(); break; - case 11: _t->hit_action(); break; - case 12: _t->hit_object(); break; - case 13: _t->hit_flow(); break; - case 14: _t->hit_dependency(); break; - case 15: _t->hit_package(); break; - case 16: _t->hit_fragment(); break; - case 17: _t->hit_note(); break; - case 18: _t->hit_anchor(); break; - case 19: _t->hit_text(); break; - case 20: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ActivityDiagramWindow, - qt_meta_data_ActivityDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityDiagramWindow)) - return static_cast(const_cast< ActivityDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int ActivityDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 21) - qt_static_metacall(this, _c, _id, _a); - _id -= 21; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityDialog.cpp b/src/moc_ActivityDialog.cpp deleted file mode 100644 index e8259bb26..000000000 --- a/src/moc_ActivityDialog.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ActivityDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 25, 15, 15, 15, 0x09, - 34, 15, 15, 15, 0x09, - 55, 15, 15, 15, 0x09, - 74, 15, 15, 15, 0x09, - 92, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityDialog[] = { - "ActivityDialog\0\0polish()\0accept()\0" - "menu_specification()\0edit_description()\0" - "edit_constraint()\0change_tabs(QWidget*)\0" -}; - -void ActivityDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->menu_specification(); break; - case 3: _t->edit_description(); break; - case 4: _t->edit_constraint(); break; - case 5: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ActivityDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityDialog, - qt_meta_data_ActivityDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityDialog)) - return static_cast(const_cast< ActivityDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ActivityDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) - qt_static_metacall(this, _c, _id, _a); - _id -= 6; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityNodeCanvas.cpp b/src/moc_ActivityNodeCanvas.cpp deleted file mode 100644 index c611a8741..000000000 --- a/src/moc_ActivityNodeCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityNodeCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ActivityNodeCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityNodeCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityNodeCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x08, - 31, 19, 19, 19, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityNodeCanvas[] = { - "ActivityNodeCanvas\0\0modified()\0deleted()\0" -}; - -void ActivityNodeCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityNodeCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityNodeCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityNodeCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ActivityNodeCanvas, - qt_meta_data_ActivityNodeCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityNodeCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityNodeCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityNodeCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityNodeCanvas)) - return static_cast(const_cast< ActivityNodeCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ActivityNodeCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ActivityNodeCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityObjectCanvas.cpp b/src/moc_ActivityObjectCanvas.cpp deleted file mode 100644 index 889e7068e..000000000 --- a/src/moc_ActivityObjectCanvas.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityObjectCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ActivityObjectCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityObjectCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityObjectCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x08, - 33, 21, 21, 21, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityObjectCanvas[] = { - "ActivityObjectCanvas\0\0modified()\0" - "deleted()\0" -}; - -void ActivityObjectCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityObjectCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityObjectCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityObjectCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ActivityObjectCanvas, - qt_meta_data_ActivityObjectCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityObjectCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityObjectCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityObjectCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityObjectCanvas)) - return static_cast(const_cast< ActivityObjectCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ActivityObjectCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ActivityObjectCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityObjectData.cpp b/src/moc_ActivityObjectData.cpp deleted file mode 100644 index ab153bc69..000000000 --- a/src/moc_ActivityObjectData.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityObjectData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ActivityObjectData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityObjectData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityObjectData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityObjectData[] = { - "ActivityObjectData\0\0on_delete()\0" -}; - -void ActivityObjectData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityObjectData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityObjectData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityObjectData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_ActivityObjectData, - qt_meta_data_ActivityObjectData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityObjectData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityObjectData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityObjectData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityObjectData)) - return static_cast(const_cast< ActivityObjectData*>(this)); - if (!strcmp(_clname, "ObjectData")) - return static_cast< ObjectData*>(const_cast< ActivityObjectData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int ActivityObjectData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityObjectDialog.cpp b/src/moc_ActivityObjectDialog.cpp deleted file mode 100644 index e18724317..000000000 --- a/src/moc_ActivityObjectDialog.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityObjectDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ActivityObjectDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityObjectDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityObjectDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 8, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x09, - 31, 21, 21, 21, 0x09, - 40, 21, 21, 21, 0x09, - 59, 21, 21, 21, 0x09, - 80, 21, 21, 21, 0x09, - 101, 21, 21, 21, 0x09, - 123, 21, 21, 21, 0x09, - 135, 21, 21, 21, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityObjectDialog[] = { - "ActivityObjectDialog\0\0polish()\0accept()\0" - "edit_description()\0edit_uml_selection()\0" - "edit_cpp_selection()\0edit_java_selection()\0" - "menu_type()\0change_tabs(QWidget*)\0" -}; - -void ActivityObjectDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityObjectDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->edit_uml_selection(); break; - case 4: _t->edit_cpp_selection(); break; - case 5: _t->edit_java_selection(); break; - case 6: _t->menu_type(); break; - case 7: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ActivityObjectDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityObjectDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityObjectDialog, - qt_meta_data_ActivityObjectDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityObjectDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityObjectDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityObjectDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityObjectDialog)) - return static_cast(const_cast< ActivityObjectDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ActivityObjectDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 8) - qt_static_metacall(this, _c, _id, _a); - _id -= 8; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityPartitionCanvas.cpp b/src/moc_ActivityPartitionCanvas.cpp deleted file mode 100644 index 1fc2a482b..000000000 --- a/src/moc_ActivityPartitionCanvas.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityPartitionCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ActivityPartitionCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityPartitionCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityPartitionCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 25, 24, 24, 24, 0x08, - 36, 24, 24, 24, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityPartitionCanvas[] = { - "ActivityPartitionCanvas\0\0modified()\0" - "deleted()\0" -}; - -void ActivityPartitionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityPartitionCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActivityPartitionCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityPartitionCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ActivityPartitionCanvas, - qt_meta_data_ActivityPartitionCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityPartitionCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityPartitionCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityPartitionCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityPartitionCanvas)) - return static_cast(const_cast< ActivityPartitionCanvas*>(this)); - if (!strcmp(_clname, "ActivityContainerCanvas")) - return static_cast< ActivityContainerCanvas*>(const_cast< ActivityPartitionCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ActivityPartitionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActivityPartitionDialog.cpp b/src/moc_ActivityPartitionDialog.cpp deleted file mode 100644 index bcec8ebf0..000000000 --- a/src/moc_ActivityPartitionDialog.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActivityPartitionDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ActivityPartitionDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActivityPartitionDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActivityPartitionDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 5, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 25, 24, 24, 24, 0x09, - 34, 24, 24, 24, 0x09, - 43, 24, 24, 24, 0x09, - 62, 24, 24, 24, 0x09, - 80, 24, 24, 24, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActivityPartitionDialog[] = { - "ActivityPartitionDialog\0\0polish()\0" - "accept()\0edit_description()\0" - "menu_represents()\0change_tabs(QWidget*)\0" -}; - -void ActivityPartitionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActivityPartitionDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->menu_represents(); break; - case 4: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ActivityPartitionDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActivityPartitionDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ActivityPartitionDialog, - qt_meta_data_ActivityPartitionDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActivityPartitionDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActivityPartitionDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActivityPartitionDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActivityPartitionDialog)) - return static_cast(const_cast< ActivityPartitionDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ActivityPartitionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 5) - qt_static_metacall(this, _c, _id, _a); - _id -= 5; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ActualParamData.cpp b/src/moc_ActualParamData.cpp deleted file mode 100644 index fd2e50a72..000000000 --- a/src/moc_ActualParamData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ActualParamData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ActualParamData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ActualParamData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ActualParamData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ActualParamData[] = { - "ActualParamData\0\0on_delete()\0" -}; - -void ActualParamData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ActualParamData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ActualParamData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ActualParamData::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ActualParamData, - qt_meta_data_ActualParamData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ActualParamData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ActualParamData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ActualParamData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ActualParamData)) - return static_cast(const_cast< ActualParamData*>(this)); - return QObject::qt_metacast(_clname); -} - -int ActualParamData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_AnnotationDialog.cpp b/src/moc_AnnotationDialog.cpp deleted file mode 100644 index 3a171e162..000000000 --- a/src/moc_AnnotationDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'AnnotationDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/AnnotationDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'AnnotationDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_AnnotationDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - 27, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_AnnotationDialog[] = { - "AnnotationDialog\0\0accept()\0add_annotation()\0" -}; - -void AnnotationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - AnnotationDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->accept(); break; - case 1: _t->add_annotation(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData AnnotationDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject AnnotationDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_AnnotationDialog, - qt_meta_data_AnnotationDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &AnnotationDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *AnnotationDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *AnnotationDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_AnnotationDialog)) - return static_cast(const_cast< AnnotationDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int AnnotationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ArrowCanvas.cpp b/src/moc_ArrowCanvas.cpp deleted file mode 100644 index 2995956c0..000000000 --- a/src/moc_ArrowCanvas.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ArrowCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ArrowCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ArrowCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ArrowCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x09, - 24, 12, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ArrowCanvas[] = { - "ArrowCanvas\0\0modified()\0" - "drawing_settings_modified()\0" -}; - -void ArrowCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ArrowCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->drawing_settings_modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ArrowCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ArrowCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ArrowCanvas, - qt_meta_data_ArrowCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ArrowCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ArrowCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ArrowCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ArrowCanvas)) - return static_cast(const_cast< ArrowCanvas*>(this)); - if (!strcmp(_clname, "Q3CanvasPolygon")) - return static_cast< Q3CanvasPolygon*>(const_cast< ArrowCanvas*>(this)); - if (!strcmp(_clname, "DiagramItem")) - return static_cast< DiagramItem*>(const_cast< ArrowCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ArrowCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ArrowJunctionCanvas.cpp b/src/moc_ArrowJunctionCanvas.cpp deleted file mode 100644 index b968cb468..000000000 --- a/src/moc_ArrowJunctionCanvas.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ArrowJunctionCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ArrowJunctionCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ArrowJunctionCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ArrowJunctionCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 20, 20, 20, 0x08, - 32, 20, 20, 20, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ArrowJunctionCanvas[] = { - "ArrowJunctionCanvas\0\0modified()\0" - "deleted()\0" -}; - -void ArrowJunctionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ArrowJunctionCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ArrowJunctionCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ArrowJunctionCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ArrowJunctionCanvas, - qt_meta_data_ArrowJunctionCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ArrowJunctionCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ArrowJunctionCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ArrowJunctionCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ArrowJunctionCanvas)) - return static_cast(const_cast< ArrowJunctionCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ArrowJunctionCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ArrowJunctionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ArtifactCanvas.cpp b/src/moc_ArtifactCanvas.cpp deleted file mode 100644 index 8b72f24d7..000000000 --- a/src/moc_ArtifactCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ArtifactCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ArtifactCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ArtifactCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ArtifactCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x08, - 27, 15, 15, 15, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ArtifactCanvas[] = { - "ArtifactCanvas\0\0modified()\0deleted()\0" -}; - -void ArtifactCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ArtifactCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ArtifactCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ArtifactCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ArtifactCanvas, - qt_meta_data_ArtifactCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ArtifactCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ArtifactCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ArtifactCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ArtifactCanvas)) - return static_cast(const_cast< ArtifactCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ArtifactCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ArtifactCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ArtifactData.cpp b/src/moc_ArtifactData.cpp deleted file mode 100644 index 6ad0a312d..000000000 --- a/src/moc_ArtifactData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ArtifactData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ArtifactData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ArtifactData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ArtifactData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ArtifactData[] = { - "ArtifactData\0\0on_delete()\0" -}; - -void ArtifactData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ArtifactData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ArtifactData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ArtifactData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_ArtifactData, - qt_meta_data_ArtifactData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ArtifactData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ArtifactData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ArtifactData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ArtifactData)) - return static_cast(const_cast< ArtifactData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int ArtifactData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ArtifactDialog.cpp b/src/moc_ArtifactDialog.cpp deleted file mode 100644 index 9deeb85de..000000000 --- a/src/moc_ArtifactDialog.cpp +++ /dev/null @@ -1,186 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ArtifactDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ArtifactDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ArtifactDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ArtifactDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 38, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 25, 15, 15, 15, 0x09, - 34, 15, 15, 15, 0x09, - 43, 15, 15, 15, 0x09, - 65, 15, 15, 15, 0x09, - 84, 15, 15, 15, 0x09, - 115, 15, 15, 15, 0x09, - 136, 15, 15, 15, 0x09, - 149, 15, 15, 15, 0x09, - 164, 15, 15, 15, 0x09, - 180, 15, 15, 15, 0x09, - 197, 15, 15, 15, 0x09, - 212, 15, 15, 15, 0x09, - 229, 15, 15, 15, 0x09, - 247, 15, 15, 15, 0x09, - 266, 15, 15, 15, 0x09, - 278, 15, 15, 15, 0x09, - 296, 15, 15, 15, 0x09, - 315, 15, 15, 15, 0x09, - 335, 15, 15, 15, 0x09, - 346, 15, 15, 15, 0x09, - 363, 15, 15, 15, 0x09, - 381, 15, 15, 15, 0x09, - 400, 15, 15, 15, 0x09, - 414, 15, 15, 15, 0x09, - 434, 15, 15, 15, 0x09, - 455, 15, 15, 15, 0x09, - 477, 15, 15, 15, 0x09, - 488, 15, 15, 15, 0x09, - 505, 15, 15, 15, 0x09, - 523, 15, 15, 15, 0x09, - 542, 15, 15, 15, 0x09, - 558, 15, 15, 15, 0x09, - 576, 15, 15, 15, 0x09, - 590, 15, 15, 15, 0x09, - 606, 15, 15, 15, 0x09, - 623, 15, 15, 15, 0x09, - 642, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ArtifactDialog[] = { - "ArtifactDialog\0\0polish()\0accept()\0" - "reject()\0default_description()\0" - "edit_description()\0edStereotypeActivated(QString)\0" - "update_tab(QWidget*)\0cpp_edit_h()\0" - "cpp_update_h()\0cpp_default_h()\0" - "cpp_unmapped_h()\0cpp_edit_src()\0" - "cpp_update_src()\0cpp_default_src()\0" - "cpp_unmapped_src()\0java_edit()\0" - "java_update_src()\0java_default_src()\0" - "java_unmapped_src()\0php_edit()\0" - "php_update_src()\0php_default_src()\0" - "php_unmapped_src()\0python_edit()\0" - "python_update_src()\0python_default_src()\0" - "python_unmapped_src()\0idl_edit()\0" - "idl_update_src()\0idl_default_src()\0" - "idl_unmapped_src()\0associate_cls()\0" - "unassociate_cls()\0move_cls_up()\0" - "move_cls_down()\0associate_arts()\0" - "unassociate_arts()\0" - "stereotypeFilterActivated(QString)\0" -}; - -void ArtifactDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ArtifactDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->reject(); break; - case 3: _t->default_description(); break; - case 4: _t->edit_description(); break; - case 5: _t->edStereotypeActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 6: _t->update_tab((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - case 7: _t->cpp_edit_h(); break; - case 8: _t->cpp_update_h(); break; - case 9: _t->cpp_default_h(); break; - case 10: _t->cpp_unmapped_h(); break; - case 11: _t->cpp_edit_src(); break; - case 12: _t->cpp_update_src(); break; - case 13: _t->cpp_default_src(); break; - case 14: _t->cpp_unmapped_src(); break; - case 15: _t->java_edit(); break; - case 16: _t->java_update_src(); break; - case 17: _t->java_default_src(); break; - case 18: _t->java_unmapped_src(); break; - case 19: _t->php_edit(); break; - case 20: _t->php_update_src(); break; - case 21: _t->php_default_src(); break; - case 22: _t->php_unmapped_src(); break; - case 23: _t->python_edit(); break; - case 24: _t->python_update_src(); break; - case 25: _t->python_default_src(); break; - case 26: _t->python_unmapped_src(); break; - case 27: _t->idl_edit(); break; - case 28: _t->idl_update_src(); break; - case 29: _t->idl_default_src(); break; - case 30: _t->idl_unmapped_src(); break; - case 31: _t->associate_cls(); break; - case 32: _t->unassociate_cls(); break; - case 33: _t->move_cls_up(); break; - case 34: _t->move_cls_down(); break; - case 35: _t->associate_arts(); break; - case 36: _t->unassociate_arts(); break; - case 37: _t->stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ArtifactDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ArtifactDialog::staticMetaObject = { - { &EdgeMenuDialog::staticMetaObject, qt_meta_stringdata_ArtifactDialog, - qt_meta_data_ArtifactDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ArtifactDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ArtifactDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ArtifactDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ArtifactDialog)) - return static_cast(const_cast< ArtifactDialog*>(this)); - return EdgeMenuDialog::qt_metacast(_clname); -} - -int ArtifactDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = EdgeMenuDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 38) - qt_static_metacall(this, _c, _id, _a); - _id -= 38; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_AttributeData.cpp b/src/moc_AttributeData.cpp deleted file mode 100644 index 08d80fcbe..000000000 --- a/src/moc_AttributeData.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'AttributeData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/AttributeData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'AttributeData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_AttributeData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x09, - 27, 14, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_AttributeData[] = { - "AttributeData\0\0on_delete()\0" - "on_delete_idlcase()\0" -}; - -void AttributeData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - AttributeData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - case 1: _t->on_delete_idlcase(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData AttributeData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject AttributeData::staticMetaObject = { - { &ClassMemberData::staticMetaObject, qt_meta_stringdata_AttributeData, - qt_meta_data_AttributeData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &AttributeData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *AttributeData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *AttributeData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_AttributeData)) - return static_cast(const_cast< AttributeData*>(this)); - return ClassMemberData::qt_metacast(_clname); -} - -int AttributeData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ClassMemberData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_AttributeDialog.cpp b/src/moc_AttributeDialog.cpp deleted file mode 100644 index 993fd49ed..000000000 --- a/src/moc_AttributeDialog.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'AttributeDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/AttributeDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'AttributeDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_AttributeDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 28, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - 35, 16, 16, 16, 0x09, - 47, 16, 16, 16, 0x09, - 69, 16, 16, 16, 0x09, - 88, 16, 16, 16, 0x09, - 106, 16, 16, 16, 0x09, - 118, 16, 16, 16, 0x09, - 140, 16, 16, 16, 0x09, - 154, 16, 16, 16, 0x09, - 169, 16, 16, 16, 0x09, - 182, 16, 16, 16, 0x09, - 197, 16, 16, 16, 0x09, - 217, 16, 16, 16, 0x09, - 233, 16, 16, 16, 0x09, - 247, 16, 16, 16, 0x09, - 270, 16, 16, 16, 0x09, - 284, 16, 16, 16, 0x09, - 299, 16, 16, 16, 0x09, - 312, 16, 16, 16, 0x09, - 329, 16, 16, 16, 0x09, - 347, 16, 16, 16, 0x09, - 363, 16, 16, 16, 0x09, - 377, 16, 16, 16, 0x09, - 397, 16, 16, 16, 0x09, - 420, 16, 16, 16, 0x09, - 435, 16, 16, 16, 0x09, - 448, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_AttributeDialog[] = { - "AttributeDialog\0\0polish()\0accept()\0" - "edit_init()\0default_description()\0" - "edit_description()\0edit_constraint()\0" - "menu_type()\0derived_changed(bool)\0" - "cpp_default()\0cpp_unmapped()\0cpp_update()\0" - "java_default()\0java_default_item()\0" - "java_unmapped()\0java_update()\0" - "java_edit_annotation()\0php_default()\0" - "php_unmapped()\0php_update()\0" - "python_default()\0python_unmapped()\0" - "python_update()\0idl_default()\0" - "idl_default_state()\0idl_default_constant()\0" - "idl_unmapped()\0idl_update()\0" - "update_all_tabs(QWidget*)\0" -}; - -void AttributeDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - AttributeDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_init(); break; - case 3: _t->default_description(); break; - case 4: _t->edit_description(); break; - case 5: _t->edit_constraint(); break; - case 6: _t->menu_type(); break; - case 7: _t->derived_changed((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 8: _t->cpp_default(); break; - case 9: _t->cpp_unmapped(); break; - case 10: _t->cpp_update(); break; - case 11: _t->java_default(); break; - case 12: _t->java_default_item(); break; - case 13: _t->java_unmapped(); break; - case 14: _t->java_update(); break; - case 15: _t->java_edit_annotation(); break; - case 16: _t->php_default(); break; - case 17: _t->php_unmapped(); break; - case 18: _t->php_update(); break; - case 19: _t->python_default(); break; - case 20: _t->python_unmapped(); break; - case 21: _t->python_update(); break; - case 22: _t->idl_default(); break; - case 23: _t->idl_default_state(); break; - case 24: _t->idl_default_constant(); break; - case 25: _t->idl_unmapped(); break; - case 26: _t->idl_update(); break; - case 27: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData AttributeDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject AttributeDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_AttributeDialog, - qt_meta_data_AttributeDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &AttributeDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *AttributeDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *AttributeDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_AttributeDialog)) - return static_cast(const_cast< AttributeDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int AttributeDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 28) - qt_static_metacall(this, _c, _id, _a); - _id -= 28; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_BasicData.cpp b/src/moc_BasicData.cpp deleted file mode 100644 index 811084520..000000000 --- a/src/moc_BasicData.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'BasicData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/BasicData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'BasicData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_BasicData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 2, // signalCount - - // signals: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x05, - 21, 10, 10, 10, 0x05, - - // slots: signature, parameters, type, tag, flags - 31, 10, 10, 10, 0x09, - 43, 10, 10, 10, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_BasicData[] = { - "BasicData\0\0changed()\0deleted()\0" - "on_delete()\0modified()\0" -}; - -void BasicData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - BasicData *_t = static_cast(_o); - switch (_id) { - case 0: _t->changed(); break; - case 1: _t->deleted(); break; - case 2: _t->on_delete(); break; - case 3: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData BasicData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject BasicData::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_BasicData, - qt_meta_data_BasicData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &BasicData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *BasicData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *BasicData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_BasicData)) - return static_cast(const_cast< BasicData*>(this)); - return QObject::qt_metacast(_clname); -} - -int BasicData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} - -// SIGNAL 0 -void BasicData::changed() -{ - QMetaObject::activate(this, &staticMetaObject, 0, 0); -} - -// SIGNAL 1 -void BasicData::deleted() -{ - QMetaObject::activate(this, &staticMetaObject, 1, 0); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_BasicDialog.cpp b/src/moc_BasicDialog.cpp deleted file mode 100644 index 9452e014d..000000000 --- a/src/moc_BasicDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'BasicDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/BasicDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'BasicDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_BasicDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x09, - 22, 12, 12, 12, 0x09, - 31, 12, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_BasicDialog[] = { - "BasicDialog\0\0polish()\0accept()\0" - "edit_description()\0" -}; - -void BasicDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - BasicDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData BasicDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject BasicDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_BasicDialog, - qt_meta_data_BasicDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &BasicDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *BasicDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *BasicDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_BasicDialog)) - return static_cast(const_cast< BasicDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int BasicDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_BodyDialog.cpp b/src/moc_BodyDialog.cpp deleted file mode 100644 index 9e46a0fc2..000000000 --- a/src/moc_BodyDialog.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'BodyDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/BodyDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'BodyDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_BodyDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_BodyDialog[] = { - "BodyDialog\0" -}; - -void BodyDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData BodyDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject BodyDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_BodyDialog, - qt_meta_data_BodyDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &BodyDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *BodyDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *BodyDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_BodyDialog)) - return static_cast(const_cast< BodyDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int BodyDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_BrowserSearchDialog.cpp b/src/moc_BrowserSearchDialog.cpp deleted file mode 100644 index a7ef01ec7..000000000 --- a/src/moc_BrowserSearchDialog.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'BrowserSearchDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/BrowserSearchDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'BrowserSearchDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_BrowserSearchDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 7, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 20, 20, 20, 0x09, - 30, 20, 20, 20, 0x09, - 39, 20, 20, 20, 0x09, - 48, 20, 20, 20, 0x09, - 62, 20, 20, 20, 0x09, - 76, 20, 20, 20, 0x09, - 88, 20, 20, 20, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_BrowserSearchDialog[] = { - "BrowserSearchDialog\0\0polish()\0search()\0" - "select()\0selected(int)\0mark_unmark()\0" - "mark_them()\0unmark_all()\0" -}; - -void BrowserSearchDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - BrowserSearchDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->search(); break; - case 2: _t->select(); break; - case 3: _t->selected((*reinterpret_cast< int(*)>(_a[1]))); break; - case 4: _t->mark_unmark(); break; - case 5: _t->mark_them(); break; - case 6: _t->unmark_all(); break; - default: ; - } - } -} - -const QMetaObjectExtraData BrowserSearchDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject BrowserSearchDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_BrowserSearchDialog, - qt_meta_data_BrowserSearchDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &BrowserSearchDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *BrowserSearchDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *BrowserSearchDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_BrowserSearchDialog)) - return static_cast(const_cast< BrowserSearchDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int BrowserSearchDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 7) - qt_static_metacall(this, _c, _id, _a); - _id -= 7; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_BrowserView.cpp b/src/moc_BrowserView.cpp deleted file mode 100644 index 03d928a15..000000000 --- a/src/moc_BrowserView.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'BrowserView.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/BrowserView.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'BrowserView.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_BrowserView[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 17, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x05, - - // slots: signature, parameters, type, tag, flags - 46, 12, 12, 12, 0x09, - 72, 12, 12, 12, 0x09, - 102, 12, 12, 12, 0x09, - 131, 12, 12, 12, 0x09, - 140, 138, 12, 12, 0x09, - 179, 138, 12, 12, 0x09, - 210, 138, 12, 12, 0x09, - 247, 138, 12, 12, 0x09, - 285, 138, 12, 12, 0x09, - 325, 12, 12, 12, 0x0a, - 341, 12, 12, 12, 0x0a, - 358, 12, 12, 12, 0x0a, - 374, 12, 12, 12, 0x0a, - 393, 12, 12, 12, 0x0a, - 419, 409, 12, 12, 0x0a, - 445, 12, 12, 12, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_BrowserView[] = { - "BrowserView\0\0marked_list(QList)\0" - "selected(Q3ListViewItem*)\0" - "rightPressed(Q3ListViewItem*)\0" - "doubleClick(Q3ListViewItem*)\0menu()\0" - "e\0contentsDragMoveEvent(QDragMoveEvent*)\0" - "contentsDropEvent(QDropEvent*)\0" - "contentsMouseMoveEvent(QMouseEvent*)\0" - "contentsMousePressEvent(QMouseEvent*)\0" - "contentsMouseReleaseEvent(QMouseEvent*)\0" - "OnGenerateCpp()\0OnGenerateJava()\0" - "OnGeneratePhp()\0OnGeneratePython()\0" - "OnGenerateIdl()\0name,type\0" - "OnUnmarkItem(QString,int)\0OnUnmarkAll()\0" -}; - -void BrowserView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - BrowserView *_t = static_cast(_o); - switch (_id) { - case 0: _t->marked_list((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 1: _t->selected((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; - case 2: _t->rightPressed((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; - case 3: _t->doubleClick((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; - case 4: _t->menu(); break; - case 5: _t->contentsDragMoveEvent((*reinterpret_cast< QDragMoveEvent*(*)>(_a[1]))); break; - case 6: _t->contentsDropEvent((*reinterpret_cast< QDropEvent*(*)>(_a[1]))); break; - case 7: _t->contentsMouseMoveEvent((*reinterpret_cast< QMouseEvent*(*)>(_a[1]))); break; - case 8: _t->contentsMousePressEvent((*reinterpret_cast< QMouseEvent*(*)>(_a[1]))); break; - case 9: _t->contentsMouseReleaseEvent((*reinterpret_cast< QMouseEvent*(*)>(_a[1]))); break; - case 10: _t->OnGenerateCpp(); break; - case 11: _t->OnGenerateJava(); break; - case 12: _t->OnGeneratePhp(); break; - case 13: _t->OnGeneratePython(); break; - case 14: _t->OnGenerateIdl(); break; - case 15: _t->OnUnmarkItem((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - case 16: _t->OnUnmarkAll(); break; - default: ; - } - } -} - -const QMetaObjectExtraData BrowserView::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject BrowserView::staticMetaObject = { - { &Q3ListView::staticMetaObject, qt_meta_stringdata_BrowserView, - qt_meta_data_BrowserView, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &BrowserView::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *BrowserView::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *BrowserView::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_BrowserView)) - return static_cast(const_cast< BrowserView*>(this)); - return Q3ListView::qt_metacast(_clname); -} - -int BrowserView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3ListView::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 17) - qt_static_metacall(this, _c, _id, _a); - _id -= 17; - } - return _id; -} - -// SIGNAL 0 -void BrowserView::marked_list(QList _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 0, _a); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_CdClassCanvas.cpp b/src/moc_CdClassCanvas.cpp deleted file mode 100644 index f8551e2a5..000000000 --- a/src/moc_CdClassCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CdClassCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/CdClassCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CdClassCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CdClassCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x08, - 26, 14, 14, 14, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_CdClassCanvas[] = { - "CdClassCanvas\0\0modified()\0deleted()\0" -}; - -void CdClassCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CdClassCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CdClassCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CdClassCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_CdClassCanvas, - qt_meta_data_CdClassCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CdClassCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CdClassCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CdClassCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CdClassCanvas)) - return static_cast(const_cast< CdClassCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< CdClassCanvas*>(this)); - if (!strcmp(_clname, "MultipleDependency")) - return static_cast< MultipleDependency*>(const_cast< CdClassCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int CdClassCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassData.cpp b/src/moc_ClassData.cpp deleted file mode 100644 index 90f333dcc..000000000 --- a/src/moc_ClassData.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ClassData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClassData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x05, - - // slots: signature, parameters, type, tag, flags - 29, 10, 10, 10, 0x08, - 46, 10, 10, 10, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassData[] = { - "ClassData\0\0actuals_changed()\0" - "update_actuals()\0on_delete()\0" -}; - -void ClassData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClassData *_t = static_cast(_o); - switch (_id) { - case 0: _t->actuals_changed(); break; - case 1: _t->update_actuals(); break; - case 2: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ClassData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassData::staticMetaObject = { - { &BasicData::staticMetaObject, qt_meta_stringdata_ClassData, - qt_meta_data_ClassData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassData)) - return static_cast(const_cast< ClassData*>(this)); - return BasicData::qt_metacast(_clname); -} - -int ClassData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = BasicData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} - -// SIGNAL 0 -void ClassData::actuals_changed() -{ - QMetaObject::activate(this, &staticMetaObject, 0, 0); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassDiagramWindow.cpp b/src/moc_ClassDiagramWindow.cpp deleted file mode 100644 index a70bb4381..000000000 --- a/src/moc_ClassDiagramWindow.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ClassDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClassDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 16, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - 32, 19, 19, 19, 0x09, - 46, 19, 19, 19, 0x09, - 61, 19, 19, 19, 0x09, - 75, 19, 19, 19, 0x09, - 92, 19, 19, 19, 0x09, - 110, 19, 19, 19, 0x09, - 139, 19, 19, 19, 0x09, - 157, 19, 19, 19, 0x09, - 182, 19, 19, 19, 0x09, - 211, 19, 19, 19, 0x09, - 247, 19, 19, 19, 0x09, - 261, 19, 19, 19, 0x09, - 272, 19, 19, 19, 0x09, - 285, 19, 19, 19, 0x09, - 296, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassDiagramWindow[] = { - "ClassDiagramWindow\0\0hit_class()\0" - "hit_package()\0hit_fragment()\0hit_inherit()\0" - "hit_dependency()\0hit_association()\0" - "hit_directionalassociation()\0" - "hit_aggregation()\0hit_aggregationbyvalue()\0" - "hit_directionalaggregation()\0" - "hit_directionalaggregationbyvalue()\0" - "hit_realize()\0hit_note()\0hit_anchor()\0" - "hit_text()\0hit_image()\0" -}; - -void ClassDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClassDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_class(); break; - case 1: _t->hit_package(); break; - case 2: _t->hit_fragment(); break; - case 3: _t->hit_inherit(); break; - case 4: _t->hit_dependency(); break; - case 5: _t->hit_association(); break; - case 6: _t->hit_directionalassociation(); break; - case 7: _t->hit_aggregation(); break; - case 8: _t->hit_aggregationbyvalue(); break; - case 9: _t->hit_directionalaggregation(); break; - case 10: _t->hit_directionalaggregationbyvalue(); break; - case 11: _t->hit_realize(); break; - case 12: _t->hit_note(); break; - case 13: _t->hit_anchor(); break; - case 14: _t->hit_text(); break; - case 15: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ClassDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ClassDiagramWindow, - qt_meta_data_ClassDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassDiagramWindow)) - return static_cast(const_cast< ClassDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int ClassDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 16) - qt_static_metacall(this, _c, _id, _a); - _id -= 16; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassDialog.cpp b/src/moc_ClassDialog.cpp deleted file mode 100644 index 1c6e3fec1..000000000 --- a/src/moc_ClassDialog.cpp +++ /dev/null @@ -1,306 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassDialog.h' -** -** Created: Sat May 25 00:24:50 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ClassDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClassDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 26, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x09, - 22, 12, 12, 12, 0x09, - 31, 12, 12, 12, 0x09, - 53, 12, 12, 12, 0x09, - 72, 12, 12, 12, 0x09, - 90, 12, 12, 12, 0x09, - 121, 12, 12, 12, 0x09, - 135, 12, 12, 12, 0x09, - 156, 12, 12, 12, 0x09, - 176, 12, 12, 12, 0x09, - 202, 12, 12, 12, 0x09, - 220, 12, 12, 12, 0x09, - 239, 12, 12, 12, 0x09, - 259, 12, 12, 12, 0x09, - 278, 12, 12, 12, 0x09, - 298, 12, 12, 12, 0x09, - 319, 12, 12, 12, 0x09, - 342, 12, 12, 12, 0x09, - 360, 12, 12, 12, 0x09, - 379, 12, 12, 12, 0x09, - 399, 12, 12, 12, 0x09, - 420, 12, 12, 12, 0x09, - 442, 12, 12, 12, 0x09, - 465, 12, 12, 12, 0x09, - 483, 12, 12, 12, 0x09, - 502, 12, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassDialog[] = { - "ClassDialog\0\0polish()\0accept()\0" - "default_description()\0edit_description()\0" - "edit_constraint()\0edStereotypeActivated(QString)\0" - "icon_browse()\0icon_root_relative()\0" - "icon_prj_relative()\0update_all_tabs(QWidget*)\0" - "cpp_update_decl()\0cpp_default_decl()\0" - "cpp_unmapped_decl()\0java_update_decl()\0" - "java_default_decl()\0java_unmapped_decl()\0" - "java_edit_annotation()\0php_update_decl()\0" - "php_default_decl()\0php_unmapped_decl()\0" - "python_update_decl()\0python_default_decl()\0" - "python_unmapped_decl()\0idl_update_decl()\0" - "idl_default_decl()\0idl_unmapped_decl()\0" -}; - -void ClassDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClassDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->default_description(); break; - case 3: _t->edit_description(); break; - case 4: _t->edit_constraint(); break; - case 5: _t->edStereotypeActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 6: _t->icon_browse(); break; - case 7: _t->icon_root_relative(); break; - case 8: _t->icon_prj_relative(); break; - case 9: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - case 10: _t->cpp_update_decl(); break; - case 11: _t->cpp_default_decl(); break; - case 12: _t->cpp_unmapped_decl(); break; - case 13: _t->java_update_decl(); break; - case 14: _t->java_default_decl(); break; - case 15: _t->java_unmapped_decl(); break; - case 16: _t->java_edit_annotation(); break; - case 17: _t->php_update_decl(); break; - case 18: _t->php_default_decl(); break; - case 19: _t->php_unmapped_decl(); break; - case 20: _t->python_update_decl(); break; - case 21: _t->python_default_decl(); break; - case 22: _t->python_unmapped_decl(); break; - case 23: _t->idl_update_decl(); break; - case 24: _t->idl_default_decl(); break; - case 25: _t->idl_unmapped_decl(); break; - default: ; - } - } -} - -const QMetaObjectExtraData ClassDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassDialog::staticMetaObject = { - { &EdgeMenuDialog::staticMetaObject, qt_meta_stringdata_ClassDialog, - qt_meta_data_ClassDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassDialog)) - return static_cast(const_cast< ClassDialog*>(this)); - return EdgeMenuDialog::qt_metacast(_clname); -} - -int ClassDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = EdgeMenuDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 26) - qt_static_metacall(this, _c, _id, _a); - _id -= 26; - } - return _id; -} -static const uint qt_meta_data_FormalParamsTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 43, 19, 18, 18, 0x09, - 86, 78, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_FormalParamsTable[] = { - "FormalParamsTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0value_changed(int,int)\0" -}; - -void FormalParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - FormalParamsTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData FormalParamsTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject FormalParamsTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_FormalParamsTable, - qt_meta_data_FormalParamsTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &FormalParamsTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *FormalParamsTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *FormalParamsTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_FormalParamsTable)) - return static_cast(const_cast< FormalParamsTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int FormalParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_ApplicableOnTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 29, 19, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ApplicableOnTable[] = { - "ApplicableOnTable\0\0row,col,,\0" - "button_pressed(int,int,int,QPoint)\0" -}; - -void ApplicableOnTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ApplicableOnTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ApplicableOnTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ApplicableOnTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_ApplicableOnTable, - qt_meta_data_ApplicableOnTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ApplicableOnTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ApplicableOnTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ApplicableOnTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ApplicableOnTable)) - return static_cast(const_cast< ApplicableOnTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int ApplicableOnTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassInstanceData.cpp b/src/moc_ClassInstanceData.cpp deleted file mode 100644 index a0801f64b..000000000 --- a/src/moc_ClassInstanceData.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassInstanceData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ClassInstanceData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassInstanceData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClassInstanceData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x0a, - 27, 18, 18, 18, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassInstanceData[] = { - "ClassInstanceData\0\0check()\0check_rels()\0" -}; - -void ClassInstanceData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClassInstanceData *_t = static_cast(_o); - switch (_id) { - case 0: _t->check(); break; - case 1: _t->check_rels(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ClassInstanceData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassInstanceData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_ClassInstanceData, - qt_meta_data_ClassInstanceData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassInstanceData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassInstanceData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassInstanceData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassInstanceData)) - return static_cast(const_cast< ClassInstanceData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int ClassInstanceData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassInstanceDialog.cpp b/src/moc_ClassInstanceDialog.cpp deleted file mode 100644 index 345a32151..000000000 --- a/src/moc_ClassInstanceDialog.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassInstanceDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ClassInstanceDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassInstanceDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_RelTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 34, 10, 9, 9, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_RelTable[] = { - "RelTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" -}; - -void RelTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - RelTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData RelTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject RelTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_RelTable, - qt_meta_data_RelTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &RelTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *RelTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *RelTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_RelTable)) - return static_cast(const_cast< RelTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int RelTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -static const uint qt_meta_data_ClassInstanceDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 20, 20, 20, 0x09, - 30, 20, 20, 20, 0x09, - 39, 20, 20, 20, 0x09, - 58, 20, 20, 20, 0x09, - 76, 20, 20, 20, 0x09, - 89, 20, 20, 20, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassInstanceDialog[] = { - "ClassInstanceDialog\0\0polish()\0accept()\0" - "edit_description()\0type_changed(int)\0" - "menu_class()\0update_all_tabs(QWidget*)\0" -}; - -void ClassInstanceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClassInstanceDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->type_changed((*reinterpret_cast< int(*)>(_a[1]))); break; - case 4: _t->menu_class(); break; - case 5: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ClassInstanceDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassInstanceDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ClassInstanceDialog, - qt_meta_data_ClassInstanceDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassInstanceDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassInstanceDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassInstanceDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassInstanceDialog)) - return static_cast(const_cast< ClassInstanceDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ClassInstanceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) - qt_static_metacall(this, _c, _id, _a); - _id -= 6; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassMemberData.cpp b/src/moc_ClassMemberData.cpp deleted file mode 100644 index a3fcf300c..000000000 --- a/src/moc_ClassMemberData.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassMemberData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ClassMemberData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassMemberData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClassMemberData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassMemberData[] = { - "ClassMemberData\0" -}; - -void ClassMemberData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ClassMemberData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassMemberData::staticMetaObject = { - { &BasicData::staticMetaObject, qt_meta_stringdata_ClassMemberData, - qt_meta_data_ClassMemberData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassMemberData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassMemberData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassMemberData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassMemberData)) - return static_cast(const_cast< ClassMemberData*>(this)); - return BasicData::qt_metacast(_clname); -} - -int ClassMemberData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = BasicData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassSettingsDialog.cpp b/src/moc_ClassSettingsDialog.cpp deleted file mode 100644 index 8b06b9bb2..000000000 --- a/src/moc_ClassSettingsDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassSettingsDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ClassSettingsDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassSettingsDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClassSettingsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 20, 20, 20, 0x09, - 30, 20, 20, 20, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassSettingsDialog[] = { - "ClassSettingsDialog\0\0polish()\0accept()\0" -}; - -void ClassSettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClassSettingsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ClassSettingsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassSettingsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_ClassSettingsDialog, - qt_meta_data_ClassSettingsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassSettingsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassSettingsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassSettingsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassSettingsDialog)) - return static_cast(const_cast< ClassSettingsDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int ClassSettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClassViewDialog.cpp b/src/moc_ClassViewDialog.cpp deleted file mode 100644 index 471322c4c..000000000 --- a/src/moc_ClassViewDialog.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClassViewDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ClassViewDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClassViewDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClassViewDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - 35, 16, 16, 16, 0x09, - 54, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClassViewDialog[] = { - "ClassViewDialog\0\0polish()\0accept()\0" - "edit_description()\0change_tabs(QWidget*)\0" -}; - -void ClassViewDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClassViewDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ClassViewDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClassViewDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ClassViewDialog, - qt_meta_data_ClassViewDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClassViewDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClassViewDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClassViewDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClassViewDialog)) - return static_cast(const_cast< ClassViewDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ClassViewDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ClipboardManager.cpp b/src/moc_ClipboardManager.cpp deleted file mode 100644 index c2e927df2..000000000 --- a/src/moc_ClipboardManager.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ClipboardManager.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "misc/ClipboardManager.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ClipboardManager.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ClipboardManager[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x0a, - 38, 17, 17, 17, 0x0a, - 70, 17, 17, 17, 0x0a, - 104, 17, 17, 17, 0x0a, - 127, 17, 17, 17, 0x0a, - 154, 17, 17, 17, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_ClipboardManager[] = { - "ClipboardManager\0\0OnClipboardUpdate()\0" - "OnPutItemIntoClipboard(QString)\0" - "OnPutItemIntoClipboardRequested()\0" - "OnClipboardRequested()\0" - "OnMoreClipboardRequested()\0" - "OnLessClipboardRequested()\0" -}; - -void ClipboardManager::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ClipboardManager *_t = static_cast(_o); - switch (_id) { - case 0: _t->OnClipboardUpdate(); break; - case 1: _t->OnPutItemIntoClipboard((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 2: _t->OnPutItemIntoClipboardRequested(); break; - case 3: _t->OnClipboardRequested(); break; - case 4: _t->OnMoreClipboardRequested(); break; - case 5: _t->OnLessClipboardRequested(); break; - default: ; - } - } -} - -const QMetaObjectExtraData ClipboardManager::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ClipboardManager::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ClipboardManager, - qt_meta_data_ClipboardManager, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ClipboardManager::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ClipboardManager::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ClipboardManager::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ClipboardManager)) - return static_cast(const_cast< ClipboardManager*>(this)); - return QObject::qt_metacast(_clname); -} - -int ClipboardManager::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) - qt_static_metacall(this, _c, _id, _a); - _id -= 6; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_CodAddMsgDialog.cpp b/src/moc_CodAddMsgDialog.cpp deleted file mode 100644 index 8de88b3dc..000000000 --- a/src/moc_CodAddMsgDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CodAddMsgDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/CodAddMsgDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CodAddMsgDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CodAddMsgDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 27, 16, 16, 16, 0x09, - 36, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_CodAddMsgDialog[] = { - "CodAddMsgDialog\0\0menu_op()\0polish()\0" - "accept()\0" -}; - -void CodAddMsgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CodAddMsgDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->menu_op(); break; - case 1: _t->polish(); break; - case 2: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CodAddMsgDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CodAddMsgDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_CodAddMsgDialog, - qt_meta_data_CodAddMsgDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CodAddMsgDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CodAddMsgDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CodAddMsgDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CodAddMsgDialog)) - return static_cast(const_cast< CodAddMsgDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int CodAddMsgDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_CodChangeMsgDialog.cpp b/src/moc_CodChangeMsgDialog.cpp deleted file mode 100644 index df1bc1a1e..000000000 --- a/src/moc_CodChangeMsgDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CodChangeMsgDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/CodChangeMsgDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CodChangeMsgDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CodChangeMsgDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - 30, 19, 19, 19, 0x09, - 39, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_CodChangeMsgDialog[] = { - "CodChangeMsgDialog\0\0menu_op()\0polish()\0" - "accept()\0" -}; - -void CodChangeMsgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CodChangeMsgDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->menu_op(); break; - case 1: _t->polish(); break; - case 2: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CodChangeMsgDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CodChangeMsgDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_CodChangeMsgDialog, - qt_meta_data_CodChangeMsgDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CodChangeMsgDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CodChangeMsgDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CodChangeMsgDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CodChangeMsgDialog)) - return static_cast(const_cast< CodChangeMsgDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int CodChangeMsgDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_CodClassInstCanvas.cpp b/src/moc_CodClassInstCanvas.cpp deleted file mode 100644 index eeda124c8..000000000 --- a/src/moc_CodClassInstCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CodClassInstCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/CodClassInstCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CodClassInstCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CodClassInstCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x08, - 31, 19, 19, 19, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_CodClassInstCanvas[] = { - "CodClassInstCanvas\0\0modified()\0deleted()\0" -}; - -void CodClassInstCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CodClassInstCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CodClassInstCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CodClassInstCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_CodClassInstCanvas, - qt_meta_data_CodClassInstCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CodClassInstCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CodClassInstCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CodClassInstCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CodClassInstCanvas)) - return static_cast(const_cast< CodClassInstCanvas*>(this)); - if (!strcmp(_clname, "CodObjCanvas")) - return static_cast< CodObjCanvas*>(const_cast< CodClassInstCanvas*>(this)); - if (!strcmp(_clname, "ClassInstCanvas")) - return static_cast< ClassInstCanvas*>(const_cast< CodClassInstCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int CodClassInstCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_CodDirsCanvas.cpp b/src/moc_CodDirsCanvas.cpp deleted file mode 100644 index bfb35be26..000000000 --- a/src/moc_CodDirsCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CodDirsCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/CodDirsCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CodDirsCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CodDirsCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_CodDirsCanvas[] = { - "CodDirsCanvas\0\0modified()\0" -}; - -void CodDirsCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CodDirsCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CodDirsCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CodDirsCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_CodDirsCanvas, - qt_meta_data_CodDirsCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CodDirsCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CodDirsCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CodDirsCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CodDirsCanvas)) - return static_cast(const_cast< CodDirsCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< CodDirsCanvas*>(this)); - if (!strcmp(_clname, "CodMsgSupport")) - return static_cast< CodMsgSupport*>(const_cast< CodDirsCanvas*>(this)); - if (!strcmp(_clname, "MultipleDependency")) - return static_cast< MultipleDependency*>(const_cast< CodDirsCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int CodDirsCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_CodSelfLinkCanvas.cpp b/src/moc_CodSelfLinkCanvas.cpp deleted file mode 100644 index 8078e92e2..000000000 --- a/src/moc_CodSelfLinkCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CodSelfLinkCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/CodSelfLinkCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CodSelfLinkCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CodSelfLinkCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_CodSelfLinkCanvas[] = { - "CodSelfLinkCanvas\0\0modified()\0" -}; - -void CodSelfLinkCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CodSelfLinkCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CodSelfLinkCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CodSelfLinkCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_CodSelfLinkCanvas, - qt_meta_data_CodSelfLinkCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CodSelfLinkCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CodSelfLinkCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CodSelfLinkCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CodSelfLinkCanvas)) - return static_cast(const_cast< CodSelfLinkCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< CodSelfLinkCanvas*>(this)); - if (!strcmp(_clname, "CodMsgSupport")) - return static_cast< CodMsgSupport*>(const_cast< CodSelfLinkCanvas*>(this)); - if (!strcmp(_clname, "MultipleDependency")) - return static_cast< MultipleDependency*>(const_cast< CodSelfLinkCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int CodSelfLinkCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ColDiagramWindow.cpp b/src/moc_ColDiagramWindow.cpp deleted file mode 100644 index 988f135a2..000000000 --- a/src/moc_ColDiagramWindow.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ColDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ColDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ColDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ColDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 10, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - 30, 17, 17, 17, 0x09, - 50, 17, 17, 17, 0x09, - 64, 17, 17, 17, 0x09, - 79, 17, 17, 17, 0x09, - 90, 17, 17, 17, 0x09, - 105, 17, 17, 17, 0x09, - 116, 17, 17, 17, 0x09, - 129, 17, 17, 17, 0x09, - 140, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ColDiagramWindow[] = { - "ColDiagramWindow\0\0hit_class()\0" - "hit_classinstance()\0hit_package()\0" - "hit_fragment()\0hit_link()\0hit_selflink()\0" - "hit_note()\0hit_anchor()\0hit_text()\0" - "hit_image()\0" -}; - -void ColDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ColDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_class(); break; - case 1: _t->hit_classinstance(); break; - case 2: _t->hit_package(); break; - case 3: _t->hit_fragment(); break; - case 4: _t->hit_link(); break; - case 5: _t->hit_selflink(); break; - case 6: _t->hit_note(); break; - case 7: _t->hit_anchor(); break; - case 8: _t->hit_text(); break; - case 9: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ColDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ColDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ColDiagramWindow, - qt_meta_data_ColDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ColDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ColDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ColDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ColDiagramWindow)) - return static_cast(const_cast< ColDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int ColDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 10) - qt_static_metacall(this, _c, _id, _a); - _id -= 10; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ColMsgTable.cpp b/src/moc_ColMsgTable.cpp deleted file mode 100644 index 063b3bc13..000000000 --- a/src/moc_ColMsgTable.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ColMsgTable.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ColMsgTable.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ColMsgTable.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ColMsgTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 37, 13, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ColMsgTable[] = { - "ColMsgTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" -}; - -void ColMsgTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ColMsgTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ColMsgTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ColMsgTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_ColMsgTable, - qt_meta_data_ColMsgTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ColMsgTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ColMsgTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ColMsgTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ColMsgTable)) - return static_cast(const_cast< ColMsgTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int ColMsgTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentCanvas.cpp b/src/moc_ComponentCanvas.cpp deleted file mode 100644 index 538fdc262..000000000 --- a/src/moc_ComponentCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ComponentCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ComponentCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ComponentCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ComponentCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x08, - 28, 16, 16, 16, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ComponentCanvas[] = { - "ComponentCanvas\0\0modified()\0deleted()\0" -}; - -void ComponentCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ComponentCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ComponentCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ComponentCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ComponentCanvas, - qt_meta_data_ComponentCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ComponentCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ComponentCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ComponentCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ComponentCanvas)) - return static_cast(const_cast< ComponentCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ComponentCanvas*>(this)); - if (!strcmp(_clname, "MultipleDependency")) - return static_cast< MultipleDependency*>(const_cast< ComponentCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ComponentCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentDiagramView.cpp b/src/moc_ComponentDiagramView.cpp deleted file mode 100644 index dbeac05bf..000000000 --- a/src/moc_ComponentDiagramView.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ComponentDiagramView.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ComponentDiagramView.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ComponentDiagramView.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ComponentDiagramView[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_ComponentDiagramView[] = { - "ComponentDiagramView\0" -}; - -void ComponentDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ComponentDiagramView::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ComponentDiagramView::staticMetaObject = { - { &DiagramView::staticMetaObject, qt_meta_stringdata_ComponentDiagramView, - qt_meta_data_ComponentDiagramView, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ComponentDiagramView::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ComponentDiagramView::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ComponentDiagramView::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ComponentDiagramView)) - return static_cast(const_cast< ComponentDiagramView*>(this)); - return DiagramView::qt_metacast(_clname); -} - -int ComponentDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramView::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentDiagramWindow.cpp b/src/moc_ComponentDiagramWindow.cpp deleted file mode 100644 index 7fdc8f26d..000000000 --- a/src/moc_ComponentDiagramWindow.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ComponentDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ComponentDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ComponentDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ComponentDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 11, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 24, 23, 23, 23, 0x09, - 40, 23, 23, 23, 0x09, - 54, 23, 23, 23, 0x09, - 69, 23, 23, 23, 0x09, - 83, 23, 23, 23, 0x09, - 100, 23, 23, 23, 0x09, - 115, 23, 23, 23, 0x09, - 130, 23, 23, 23, 0x09, - 141, 23, 23, 23, 0x09, - 154, 23, 23, 23, 0x09, - 165, 23, 23, 23, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ComponentDiagramWindow[] = { - "ComponentDiagramWindow\0\0hit_component()\0" - "hit_package()\0hit_fragment()\0hit_inherit()\0" - "hit_dependency()\0hit_required()\0" - "hit_provided()\0hit_note()\0hit_anchor()\0" - "hit_text()\0hit_image()\0" -}; - -void ComponentDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ComponentDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_component(); break; - case 1: _t->hit_package(); break; - case 2: _t->hit_fragment(); break; - case 3: _t->hit_inherit(); break; - case 4: _t->hit_dependency(); break; - case 5: _t->hit_required(); break; - case 6: _t->hit_provided(); break; - case 7: _t->hit_note(); break; - case 8: _t->hit_anchor(); break; - case 9: _t->hit_text(); break; - case 10: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ComponentDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ComponentDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ComponentDiagramWindow, - qt_meta_data_ComponentDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ComponentDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ComponentDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ComponentDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ComponentDiagramWindow)) - return static_cast(const_cast< ComponentDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int ComponentDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 11) - qt_static_metacall(this, _c, _id, _a); - _id -= 11; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ComponentDialog.cpp b/src/moc_ComponentDialog.cpp deleted file mode 100644 index 168e2aec2..000000000 --- a/src/moc_ComponentDialog.cpp +++ /dev/null @@ -1,125 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ComponentDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ComponentDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ComponentDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ComponentDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 13, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - 35, 16, 16, 16, 0x09, - 57, 54, 16, 16, 0x09, - 95, 54, 16, 16, 0x09, - 133, 54, 16, 16, 0x09, - 171, 16, 16, 16, 0x09, - 185, 16, 16, 16, 0x09, - 201, 16, 16, 16, 0x09, - 215, 16, 16, 16, 0x09, - 231, 16, 16, 16, 0x09, - 245, 16, 16, 16, 0x09, - 261, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ComponentDialog[] = { - "ComponentDialog\0\0polish()\0accept()\0" - "edit_description()\0st\0" - "rq_stereotypeFilterActivated(QString)\0" - "pr_stereotypeFilterActivated(QString)\0" - "rz_stereotypeFilterActivated(QString)\0" - "require_cls()\0unrequire_cls()\0" - "provide_cls()\0unprovide_cls()\0" - "realize_cls()\0unrealize_cls()\0" - "change_tabs(QWidget*)\0" -}; - -void ComponentDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ComponentDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->rq_stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 4: _t->pr_stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 5: _t->rz_stereotypeFilterActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 6: _t->require_cls(); break; - case 7: _t->unrequire_cls(); break; - case 8: _t->provide_cls(); break; - case 9: _t->unprovide_cls(); break; - case 10: _t->realize_cls(); break; - case 11: _t->unrealize_cls(); break; - case 12: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ComponentDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ComponentDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ComponentDialog, - qt_meta_data_ComponentDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ComponentDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ComponentDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ComponentDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ComponentDialog)) - return static_cast(const_cast< ComponentDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ComponentDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 13) - qt_static_metacall(this, _c, _id, _a); - _id -= 13; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ConstraintCanvas.cpp b/src/moc_ConstraintCanvas.cpp deleted file mode 100644 index d0326d2ab..000000000 --- a/src/moc_ConstraintCanvas.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ConstraintCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ConstraintCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ConstraintCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ConstraintCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_ConstraintCanvas[] = { - "ConstraintCanvas\0\0update()\0" -}; - -void ConstraintCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ConstraintCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->update(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ConstraintCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ConstraintCanvas::staticMetaObject = { - { &NoteCanvas::staticMetaObject, qt_meta_stringdata_ConstraintCanvas, - qt_meta_data_ConstraintCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ConstraintCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ConstraintCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ConstraintCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ConstraintCanvas)) - return static_cast(const_cast< ConstraintCanvas*>(this)); - return NoteCanvas::qt_metacast(_clname); -} - -int ConstraintCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = NoteCanvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ConstraintDialog.cpp b/src/moc_ConstraintDialog.cpp deleted file mode 100644 index 189181616..000000000 --- a/src/moc_ConstraintDialog.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ConstraintDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ConstraintDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ConstraintDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ConstraintDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 5, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - 29, 17, 17, 17, 0x09, - 40, 17, 17, 17, 0x09, - 57, 17, 17, 17, 0x09, - 66, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ConstraintDialog[] = { - "ConstraintDialog\0\0show_all()\0hide_all()\0" - "hide_inherited()\0accept()\0polish()\0" -}; - -void ConstraintDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ConstraintDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->show_all(); break; - case 1: _t->hide_all(); break; - case 2: _t->hide_inherited(); break; - case 3: _t->accept(); break; - case 4: _t->polish(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ConstraintDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ConstraintDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_ConstraintDialog, - qt_meta_data_ConstraintDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ConstraintDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ConstraintDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ConstraintDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ConstraintDialog)) - return static_cast(const_cast< ConstraintDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int ConstraintDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 5) - qt_static_metacall(this, _c, _id, _a); - _id -= 5; - } - return _id; -} -static const uint qt_meta_data_ConstraintTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 41, 17, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ConstraintTable[] = { - "ConstraintTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" -}; - -void ConstraintTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ConstraintTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ConstraintTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ConstraintTable::staticMetaObject = { - { &Q3Table::staticMetaObject, qt_meta_stringdata_ConstraintTable, - qt_meta_data_ConstraintTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ConstraintTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ConstraintTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ConstraintTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ConstraintTable)) - return static_cast(const_cast< ConstraintTable*>(this)); - return Q3Table::qt_metacast(_clname); -} - -int ConstraintTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3Table::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ContinuationDialog.cpp b/src/moc_ContinuationDialog.cpp deleted file mode 100644 index 9219944ca..000000000 --- a/src/moc_ContinuationDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ContinuationDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ContinuationDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ContinuationDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ContinuationDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - 29, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ContinuationDialog[] = { - "ContinuationDialog\0\0polish()\0accept()\0" -}; - -void ContinuationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ContinuationDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ContinuationDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ContinuationDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_ContinuationDialog, - qt_meta_data_ContinuationDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ContinuationDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ContinuationDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ContinuationDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ContinuationDialog)) - return static_cast(const_cast< ContinuationDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int ContinuationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_DecoratorDialog.cpp b/src/moc_DecoratorDialog.cpp deleted file mode 100644 index 257845925..000000000 --- a/src/moc_DecoratorDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'DecoratorDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/DecoratorDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'DecoratorDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DecoratorDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_DecoratorDialog[] = { - "DecoratorDialog\0\0accept()\0add_decorator()\0" -}; - -void DecoratorDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - DecoratorDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->accept(); break; - case 1: _t->add_decorator(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData DecoratorDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DecoratorDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_DecoratorDialog, - qt_meta_data_DecoratorDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DecoratorDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DecoratorDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DecoratorDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DecoratorDialog)) - return static_cast(const_cast< DecoratorDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int DecoratorDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_DeploymentDiagramView.cpp b/src/moc_DeploymentDiagramView.cpp deleted file mode 100644 index 1dabc89cf..000000000 --- a/src/moc_DeploymentDiagramView.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'DeploymentDiagramView.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/DeploymentDiagramView.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'DeploymentDiagramView.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DeploymentDiagramView[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_DeploymentDiagramView[] = { - "DeploymentDiagramView\0" -}; - -void DeploymentDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData DeploymentDiagramView::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DeploymentDiagramView::staticMetaObject = { - { &DiagramView::staticMetaObject, qt_meta_stringdata_DeploymentDiagramView, - qt_meta_data_DeploymentDiagramView, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DeploymentDiagramView::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DeploymentDiagramView::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DeploymentDiagramView::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DeploymentDiagramView)) - return static_cast(const_cast< DeploymentDiagramView*>(this)); - return DiagramView::qt_metacast(_clname); -} - -int DeploymentDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramView::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_DeploymentDiagramWindow.cpp b/src/moc_DeploymentDiagramWindow.cpp deleted file mode 100644 index 2dc5c73cb..000000000 --- a/src/moc_DeploymentDiagramWindow.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'DeploymentDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/DeploymentDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'DeploymentDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DeploymentDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 14, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 25, 24, 24, 24, 0x09, - 39, 24, 24, 24, 0x09, - 54, 24, 24, 24, 0x09, - 75, 24, 24, 24, 0x09, - 91, 24, 24, 24, 0x09, - 106, 24, 24, 24, 0x09, - 120, 24, 24, 24, 0x09, - 134, 24, 24, 24, 0x09, - 144, 24, 24, 24, 0x09, - 162, 24, 24, 24, 0x09, - 179, 24, 24, 24, 0x09, - 190, 24, 24, 24, 0x09, - 203, 24, 24, 24, 0x09, - 214, 24, 24, 24, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_DeploymentDiagramWindow[] = { - "DeploymentDiagramWindow\0\0hit_package()\0" - "hit_fragment()\0hit_deploymentnode()\0" - "hit_component()\0hit_artifact()\0" - "hit_inherit()\0hit_network()\0hit_hub()\0" - "hit_association()\0hit_dependency()\0" - "hit_note()\0hit_anchor()\0hit_text()\0" - "hit_image()\0" -}; - -void DeploymentDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - DeploymentDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_package(); break; - case 1: _t->hit_fragment(); break; - case 2: _t->hit_deploymentnode(); break; - case 3: _t->hit_component(); break; - case 4: _t->hit_artifact(); break; - case 5: _t->hit_inherit(); break; - case 6: _t->hit_network(); break; - case 7: _t->hit_hub(); break; - case 8: _t->hit_association(); break; - case 9: _t->hit_dependency(); break; - case 10: _t->hit_note(); break; - case 11: _t->hit_anchor(); break; - case 12: _t->hit_text(); break; - case 13: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData DeploymentDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DeploymentDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_DeploymentDiagramWindow, - qt_meta_data_DeploymentDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DeploymentDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DeploymentDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DeploymentDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DeploymentDiagramWindow)) - return static_cast(const_cast< DeploymentDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int DeploymentDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 14) - qt_static_metacall(this, _c, _id, _a); - _id -= 14; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_DeploymentNodeCanvas.cpp b/src/moc_DeploymentNodeCanvas.cpp deleted file mode 100644 index 53ef97514..000000000 --- a/src/moc_DeploymentNodeCanvas.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'DeploymentNodeCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/DeploymentNodeCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'DeploymentNodeCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DeploymentNodeCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x08, - 33, 21, 21, 21, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_DeploymentNodeCanvas[] = { - "DeploymentNodeCanvas\0\0modified()\0" - "deleted()\0" -}; - -void DeploymentNodeCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - DeploymentNodeCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData DeploymentNodeCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DeploymentNodeCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_DeploymentNodeCanvas, - qt_meta_data_DeploymentNodeCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DeploymentNodeCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DeploymentNodeCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DeploymentNodeCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DeploymentNodeCanvas)) - return static_cast(const_cast< DeploymentNodeCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< DeploymentNodeCanvas*>(this)); - if (!strcmp(_clname, "Instance")) - return static_cast< Instance*>(const_cast< DeploymentNodeCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int DeploymentNodeCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_DiagramView.cpp b/src/moc_DiagramView.cpp deleted file mode 100644 index c7669a432..000000000 --- a/src/moc_DiagramView.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'DiagramView.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/DiagramView.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'DiagramView.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DiagramView[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 5, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 13, 12, 12, 0x09, - 41, 12, 12, 12, 0x08, - 69, 12, 12, 12, 0x08, - 91, 12, 12, 12, 0x08, - 113, 12, 12, 12, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_DiagramView[] = { - "DiagramView\0\0e\0keyPressEvent(QKeyEvent*)\0" - "keyReleaseEvent(QKeyEvent*)\0" - "optimal_window_size()\0restore_window_size()\0" - "update()\0" -}; - -void DiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - DiagramView *_t = static_cast(_o); - switch (_id) { - case 0: _t->keyPressEvent((*reinterpret_cast< QKeyEvent*(*)>(_a[1]))); break; - case 1: _t->keyReleaseEvent((*reinterpret_cast< QKeyEvent*(*)>(_a[1]))); break; - case 2: _t->optimal_window_size(); break; - case 3: _t->restore_window_size(); break; - case 4: _t->update(); break; - default: ; - } - } -} - -const QMetaObjectExtraData DiagramView::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DiagramView::staticMetaObject = { - { &Q3CanvasView::staticMetaObject, qt_meta_stringdata_DiagramView, - qt_meta_data_DiagramView, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DiagramView::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DiagramView::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DiagramView::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DiagramView)) - return static_cast(const_cast< DiagramView*>(this)); - return Q3CanvasView::qt_metacast(_clname); -} - -int DiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3CanvasView::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 5) - qt_static_metacall(this, _c, _id, _a); - _id -= 5; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_DiagramWindow.cpp b/src/moc_DiagramWindow.cpp deleted file mode 100644 index b7f70c2af..000000000 --- a/src/moc_DiagramWindow.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'DiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/DiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'DiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x0a, - 30, 14, 14, 14, 0x0a, - 42, 14, 14, 14, 0x0a, - 64, 14, 14, 14, 0x0a, - 86, 14, 14, 14, 0x0a, - 98, 14, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_DiagramWindow[] = { - "DiagramWindow\0\0new_scale(int)\0fit_scale()\0" - "optimal_window_size()\0session_window_size()\0" - "call_menu()\0hit_select()\0" -}; - -void DiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - DiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->new_scale((*reinterpret_cast< int(*)>(_a[1]))); break; - case 1: _t->fit_scale(); break; - case 2: _t->optimal_window_size(); break; - case 3: _t->session_window_size(); break; - case 4: _t->call_menu(); break; - case 5: _t->hit_select(); break; - default: ; - } - } -} - -const QMetaObjectExtraData DiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DiagramWindow::staticMetaObject = { - { &Q3MainWindow::staticMetaObject, qt_meta_stringdata_DiagramWindow, - qt_meta_data_DiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DiagramWindow)) - return static_cast(const_cast< DiagramWindow*>(this)); - return Q3MainWindow::qt_metacast(_clname); -} - -int DiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3MainWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) - qt_static_metacall(this, _c, _id, _a); - _id -= 6; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_DialogTimer.cpp b/src/moc_DialogTimer.cpp deleted file mode 100644 index 2b2a17efc..000000000 --- a/src/moc_DialogTimer.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'DialogTimer.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/DialogTimer.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'DialogTimer.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DialogTimer[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_DialogTimer[] = { - "DialogTimer\0\0readfile()\0" -}; - -void DialogTimer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - DialogTimer *_t = static_cast(_o); - switch (_id) { - case 0: _t->readfile(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData DialogTimer::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DialogTimer::staticMetaObject = { - { &QTimer::staticMetaObject, qt_meta_stringdata_DialogTimer, - qt_meta_data_DialogTimer, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DialogTimer::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DialogTimer::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DialogTimer::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DialogTimer)) - return static_cast(const_cast< DialogTimer*>(this)); - return QTimer::qt_metacast(_clname); -} - -int DialogTimer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QTimer::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_EdgeMenuDialog.cpp b/src/moc_EdgeMenuDialog.cpp deleted file mode 100644 index 44ec198c2..000000000 --- a/src/moc_EdgeMenuDialog.cpp +++ /dev/null @@ -1,147 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'EdgeMenuDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/EdgeMenuDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'EdgeMenuDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_EdgeMenuDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 10, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 4, // signalCount - - // signals: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x05, - 40, 15, 15, 15, 0x05, - 52, 15, 15, 15, 0x05, - 67, 15, 15, 15, 0x05, - - // slots: signature, parameters, type, tag, flags - 90, 15, 15, 15, 0x0a, - 110, 15, 15, 15, 0x0a, - 134, 15, 15, 15, 0x0a, - 157, 15, 15, 15, 0x0a, - 182, 15, 15, 15, 0x0a, - 215, 15, 15, 15, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_EdgeMenuDialog[] = { - "EdgeMenuDialog\0\0edgeMenuRequested(uint)\0" - "lostFocus()\0hideEdgeMenu()\0" - "repositionMenu(QPoint)\0OnPickNextSibling()\0" - "OnPickPreviousSibling()\0OnInitiateMove(QPoint)\0" - "OnInitiateResize(QPoint)\0" - "OnNewCoordinatesReceived(QPoint)\0" - "OnChangeTab(int)\0" -}; - -void EdgeMenuDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - EdgeMenuDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->edgeMenuRequested((*reinterpret_cast< uint(*)>(_a[1]))); break; - case 1: _t->lostFocus(); break; - case 2: _t->hideEdgeMenu(); break; - case 3: _t->repositionMenu((*reinterpret_cast< const QPoint(*)>(_a[1]))); break; - case 4: _t->OnPickNextSibling(); break; - case 5: _t->OnPickPreviousSibling(); break; - case 6: _t->OnInitiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 7: _t->OnInitiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 8: _t->OnNewCoordinatesReceived((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 9: _t->OnChangeTab((*reinterpret_cast< int(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData EdgeMenuDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject EdgeMenuDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_EdgeMenuDialog, - qt_meta_data_EdgeMenuDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &EdgeMenuDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *EdgeMenuDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *EdgeMenuDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuDialog)) - return static_cast(const_cast< EdgeMenuDialog*>(this)); - if (!strcmp(_clname, "EdgeMenuDialogBase")) - return static_cast< EdgeMenuDialogBase*>(const_cast< EdgeMenuDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int EdgeMenuDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 10) - qt_static_metacall(this, _c, _id, _a); - _id -= 10; - } - return _id; -} - -// SIGNAL 0 -void EdgeMenuDialog::edgeMenuRequested(uint _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 0, _a); -} - -// SIGNAL 1 -void EdgeMenuDialog::lostFocus() -{ - QMetaObject::activate(this, &staticMetaObject, 1, 0); -} - -// SIGNAL 2 -void EdgeMenuDialog::hideEdgeMenu() -{ - QMetaObject::activate(this, &staticMetaObject, 2, 0); -} - -// SIGNAL 3 -void EdgeMenuDialog::repositionMenu(const QPoint & _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 3, _a); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_EdgeMenuFactory.cpp b/src/moc_EdgeMenuFactory.cpp deleted file mode 100644 index e39dbf88e..000000000 --- a/src/moc_EdgeMenuFactory.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'EdgeMenuFactory.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "Factories/EdgeMenuFactory.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'EdgeMenuFactory.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_EdgeMenuFactory[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 25, 17, 16, 16, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_EdgeMenuFactory[] = { - "EdgeMenuFactory\0\0classID\0" - "OnEdgeMenuRequested(uint)\0" -}; - -void EdgeMenuFactory::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - EdgeMenuFactory *_t = static_cast(_o); - switch (_id) { - case 0: _t->OnEdgeMenuRequested((*reinterpret_cast< uint(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData EdgeMenuFactory::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject EdgeMenuFactory::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_EdgeMenuFactory, - qt_meta_data_EdgeMenuFactory, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &EdgeMenuFactory::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *EdgeMenuFactory::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *EdgeMenuFactory::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuFactory)) - return static_cast(const_cast< EdgeMenuFactory*>(this)); - return QObject::qt_metacast(_clname); -} - -int EdgeMenuFactory::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_EdgeMenuToolBar.cpp b/src/moc_EdgeMenuToolBar.cpp deleted file mode 100644 index 2dc66c68d..000000000 --- a/src/moc_EdgeMenuToolBar.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'EdgeMenuToolBar.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "CustomWidgets/EdgeMenuToolBar.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'EdgeMenuToolBar.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_EdgeMenuToolBar[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 13, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x05, - - // slots: signature, parameters, type, tag, flags - 43, 16, 16, 16, 0x0a, - 66, 16, 16, 16, 0x0a, - 91, 16, 16, 16, 0x0a, - 124, 16, 16, 16, 0x0a, - 138, 16, 16, 16, 0x0a, - 150, 16, 16, 16, 0x0a, - 173, 16, 16, 16, 0x0a, - 200, 16, 16, 16, 0x0a, - 227, 16, 16, 16, 0x0a, - 257, 16, 16, 16, 0x0a, - 277, 16, 16, 16, 0x0a, - 299, 16, 16, 16, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_EdgeMenuToolBar[] = { - "EdgeMenuToolBar\0\0putIntoClipboard(QString)\0" - "OnInitiateMove(QPoint)\0OnInitiateResize(QPoint)\0" - "OnNewCoordinatesReceived(QPoint)\0" - "OnEndResize()\0OnEndMove()\0" - "OnClipboardRequested()\0" - "OnMoreClipboardRequested()\0" - "OnLessClipboardRequested()\0" - "OnPutIntoClipboardRequested()\0" - "OnDialogLostFocus()\0OnMenuHideRequested()\0" - "OnMenuRepositionRequested(QPoint)\0" -}; - -void EdgeMenuToolBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - EdgeMenuToolBar *_t = static_cast(_o); - switch (_id) { - case 0: _t->putIntoClipboard((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 1: _t->OnInitiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 2: _t->OnInitiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 3: _t->OnNewCoordinatesReceived((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 4: _t->OnEndResize(); break; - case 5: _t->OnEndMove(); break; - case 6: _t->OnClipboardRequested(); break; - case 7: _t->OnMoreClipboardRequested(); break; - case 8: _t->OnLessClipboardRequested(); break; - case 9: _t->OnPutIntoClipboardRequested(); break; - case 10: _t->OnDialogLostFocus(); break; - case 11: _t->OnMenuHideRequested(); break; - case 12: _t->OnMenuRepositionRequested((*reinterpret_cast< const QPoint(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData EdgeMenuToolBar::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject EdgeMenuToolBar::staticMetaObject = { - { &QToolBar::staticMetaObject, qt_meta_stringdata_EdgeMenuToolBar, - qt_meta_data_EdgeMenuToolBar, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &EdgeMenuToolBar::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *EdgeMenuToolBar::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *EdgeMenuToolBar::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuToolBar)) - return static_cast(const_cast< EdgeMenuToolBar*>(this)); - return QToolBar::qt_metacast(_clname); -} - -int EdgeMenuToolBar::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QToolBar::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 13) - qt_static_metacall(this, _c, _id, _a); - _id -= 13; - } - return _id; -} - -// SIGNAL 0 -void EdgeMenuToolBar::putIntoClipboard(QString _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 0, _a); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_EnvDialog.cpp b/src/moc_EnvDialog.cpp deleted file mode 100644 index 4b4969f30..000000000 --- a/src/moc_EnvDialog.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'EnvDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/EnvDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'EnvDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_EnvDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 7, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x08, - 20, 10, 10, 10, 0x08, - 29, 10, 10, 10, 0x08, - 42, 10, 10, 10, 0x08, - 61, 10, 10, 10, 0x08, - 79, 10, 10, 10, 0x08, - 95, 10, 10, 10, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_EnvDialog[] = { - "EnvDialog\0\0accept()\0reject()\0doc_browse()\0" - "navigator_browse()\0template_browse()\0" - "editor_browse()\0lang_browse()\0" -}; - -void EnvDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - EnvDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->accept(); break; - case 1: _t->reject(); break; - case 2: _t->doc_browse(); break; - case 3: _t->navigator_browse(); break; - case 4: _t->template_browse(); break; - case 5: _t->editor_browse(); break; - case 6: _t->lang_browse(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData EnvDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject EnvDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_EnvDialog, - qt_meta_data_EnvDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &EnvDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *EnvDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *EnvDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_EnvDialog)) - return static_cast(const_cast< EnvDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int EnvDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 7) - qt_static_metacall(this, _c, _id, _a); - _id -= 7; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ExpansionNodeCanvas.cpp b/src/moc_ExpansionNodeCanvas.cpp deleted file mode 100644 index b63adaeb4..000000000 --- a/src/moc_ExpansionNodeCanvas.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ExpansionNodeCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ExpansionNodeCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ExpansionNodeCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ExpansionNodeCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 20, 20, 20, 0x08, - 32, 20, 20, 20, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ExpansionNodeCanvas[] = { - "ExpansionNodeCanvas\0\0modified()\0" - "deleted()\0" -}; - -void ExpansionNodeCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ExpansionNodeCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ExpansionNodeCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ExpansionNodeCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ExpansionNodeCanvas, - qt_meta_data_ExpansionNodeCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ExpansionNodeCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ExpansionNodeCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ExpansionNodeCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ExpansionNodeCanvas)) - return static_cast(const_cast< ExpansionNodeCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ExpansionNodeCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ExpansionNodeCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ExpansionRegionCanvas.cpp b/src/moc_ExpansionRegionCanvas.cpp deleted file mode 100644 index a36c4e4a5..000000000 --- a/src/moc_ExpansionRegionCanvas.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ExpansionRegionCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ExpansionRegionCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ExpansionRegionCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ExpansionRegionCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 23, 22, 22, 22, 0x08, - 34, 22, 22, 22, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ExpansionRegionCanvas[] = { - "ExpansionRegionCanvas\0\0modified()\0" - "deleted()\0" -}; - -void ExpansionRegionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ExpansionRegionCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ExpansionRegionCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ExpansionRegionCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ExpansionRegionCanvas, - qt_meta_data_ExpansionRegionCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ExpansionRegionCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ExpansionRegionCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ExpansionRegionCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ExpansionRegionCanvas)) - return static_cast(const_cast< ExpansionRegionCanvas*>(this)); - if (!strcmp(_clname, "ActivityContainerCanvas")) - return static_cast< ActivityContainerCanvas*>(const_cast< ExpansionRegionCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ExpansionRegionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ExpansionRegionDialog.cpp b/src/moc_ExpansionRegionDialog.cpp deleted file mode 100644 index 0a8b8fb7c..000000000 --- a/src/moc_ExpansionRegionDialog.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ExpansionRegionDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ExpansionRegionDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ExpansionRegionDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ExpansionRegionDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 23, 22, 22, 22, 0x09, - 32, 22, 22, 22, 0x09, - 41, 22, 22, 22, 0x09, - 60, 22, 22, 22, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ExpansionRegionDialog[] = { - "ExpansionRegionDialog\0\0polish()\0" - "accept()\0edit_description()\0" - "change_tabs(QWidget*)\0" -}; - -void ExpansionRegionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ExpansionRegionDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ExpansionRegionDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ExpansionRegionDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ExpansionRegionDialog, - qt_meta_data_ExpansionRegionDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ExpansionRegionDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ExpansionRegionDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ExpansionRegionDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ExpansionRegionDialog)) - return static_cast(const_cast< ExpansionRegionDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ExpansionRegionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ExtraMemberData.cpp b/src/moc_ExtraMemberData.cpp deleted file mode 100644 index c4e2392d3..000000000 --- a/src/moc_ExtraMemberData.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ExtraMemberData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ExtraMemberData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ExtraMemberData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ExtraMemberData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_ExtraMemberData[] = { - "ExtraMemberData\0" -}; - -void ExtraMemberData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ExtraMemberData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ExtraMemberData::staticMetaObject = { - { &BasicData::staticMetaObject, qt_meta_stringdata_ExtraMemberData, - qt_meta_data_ExtraMemberData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ExtraMemberData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ExtraMemberData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ExtraMemberData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ExtraMemberData)) - return static_cast(const_cast< ExtraMemberData*>(this)); - return BasicData::qt_metacast(_clname); -} - -int ExtraMemberData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = BasicData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ExtraMemberDialog.cpp b/src/moc_ExtraMemberDialog.cpp deleted file mode 100644 index 3c9464279..000000000 --- a/src/moc_ExtraMemberDialog.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ExtraMemberDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ExtraMemberDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ExtraMemberDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ExtraMemberDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 9, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x09, - 28, 18, 18, 18, 0x09, - 37, 18, 18, 18, 0x09, - 53, 18, 18, 18, 0x09, - 68, 18, 18, 18, 0x09, - 85, 18, 18, 18, 0x09, - 101, 18, 18, 18, 0x09, - 120, 18, 18, 18, 0x09, - 136, 18, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ExtraMemberDialog[] = { - "ExtraMemberDialog\0\0polish()\0accept()\0" - "edit_cpp_decl()\0edit_cpp_def()\0" - "edit_java_decl()\0edit_php_decl()\0" - "edit_python_decl()\0edit_idl_decl()\0" - "edit_description()\0" -}; - -void ExtraMemberDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ExtraMemberDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_cpp_decl(); break; - case 3: _t->edit_cpp_def(); break; - case 4: _t->edit_java_decl(); break; - case 5: _t->edit_php_decl(); break; - case 6: _t->edit_python_decl(); break; - case 7: _t->edit_idl_decl(); break; - case 8: _t->edit_description(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ExtraMemberDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ExtraMemberDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ExtraMemberDialog, - qt_meta_data_ExtraMemberDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ExtraMemberDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ExtraMemberDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ExtraMemberDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ExtraMemberDialog)) - return static_cast(const_cast< ExtraMemberDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ExtraMemberDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 9) - qt_static_metacall(this, _c, _id, _a); - _id -= 9; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_FlowCanvas.cpp b/src/moc_FlowCanvas.cpp deleted file mode 100644 index 7f09c6c0e..000000000 --- a/src/moc_FlowCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'FlowCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/FlowCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'FlowCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_FlowCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x08, - 23, 11, 11, 11, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_FlowCanvas[] = { - "FlowCanvas\0\0modified()\0deleted()\0" -}; - -void FlowCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - FlowCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData FlowCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject FlowCanvas::staticMetaObject = { - { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_FlowCanvas, - qt_meta_data_FlowCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &FlowCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *FlowCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *FlowCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_FlowCanvas)) - return static_cast(const_cast< FlowCanvas*>(this)); - return ArrowCanvas::qt_metacast(_clname); -} - -int FlowCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ArrowCanvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_FlowData.cpp b/src/moc_FlowData.cpp deleted file mode 100644 index b2c015ff3..000000000 --- a/src/moc_FlowData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'FlowData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/FlowData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'FlowData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_FlowData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 10, 9, 9, 9, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_FlowData[] = { - "FlowData\0\0end_deleted()\0" -}; - -void FlowData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - FlowData *_t = static_cast(_o); - switch (_id) { - case 0: _t->end_deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData FlowData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject FlowData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_FlowData, - qt_meta_data_FlowData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &FlowData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *FlowData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *FlowData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_FlowData)) - return static_cast(const_cast< FlowData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int FlowData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_FlowDialog.cpp b/src/moc_FlowDialog.cpp deleted file mode 100644 index 857ecdf0e..000000000 --- a/src/moc_FlowDialog.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'FlowDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/FlowDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'FlowDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_FlowDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 13, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x09, - 21, 11, 11, 11, 0x09, - 30, 11, 11, 11, 0x09, - 49, 11, 11, 11, 0x09, - 66, 11, 11, 11, 0x09, - 87, 11, 11, 11, 0x09, - 113, 11, 11, 11, 0x09, - 130, 11, 11, 11, 0x09, - 151, 11, 11, 11, 0x09, - 177, 11, 11, 11, 0x09, - 195, 11, 11, 11, 0x09, - 217, 11, 11, 11, 0x09, - 244, 11, 11, 11, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_FlowDialog[] = { - "FlowDialog\0\0polish()\0accept()\0" - "edit_description()\0edit_uml_guard()\0" - "edit_uml_selection()\0edit_uml_transformation()\0" - "edit_cpp_guard()\0edit_cpp_selection()\0" - "edit_cpp_transformation()\0edit_java_guard()\0" - "edit_java_selection()\0edit_java_transformation()\0" - "change_tabs(QWidget*)\0" -}; - -void FlowDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - FlowDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->edit_uml_guard(); break; - case 4: _t->edit_uml_selection(); break; - case 5: _t->edit_uml_transformation(); break; - case 6: _t->edit_cpp_guard(); break; - case 7: _t->edit_cpp_selection(); break; - case 8: _t->edit_cpp_transformation(); break; - case 9: _t->edit_java_guard(); break; - case 10: _t->edit_java_selection(); break; - case 11: _t->edit_java_transformation(); break; - case 12: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData FlowDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject FlowDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_FlowDialog, - qt_meta_data_FlowDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &FlowDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *FlowDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *FlowDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_FlowDialog)) - return static_cast(const_cast< FlowDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int FlowDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 13) - qt_static_metacall(this, _c, _id, _a); - _id -= 13; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_FormalParamData.cpp b/src/moc_FormalParamData.cpp deleted file mode 100644 index 747af85eb..000000000 --- a/src/moc_FormalParamData.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'FormalParamData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/FormalParamData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'FormalParamData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_FormalParamData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 37, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_FormalParamData[] = { - "FormalParamData\0\0on_delete_default()\0" - "on_delete_extends()\0" -}; - -void FormalParamData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - FormalParamData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete_default(); break; - case 1: _t->on_delete_extends(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData FormalParamData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject FormalParamData::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_FormalParamData, - qt_meta_data_FormalParamData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &FormalParamData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *FormalParamData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *FormalParamData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_FormalParamData)) - return static_cast(const_cast< FormalParamData*>(this)); - return QObject::qt_metacast(_clname); -} - -int FormalParamData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_FragmentCanvas.cpp b/src/moc_FragmentCanvas.cpp deleted file mode 100644 index 6ea9f02b2..000000000 --- a/src/moc_FragmentCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'FragmentCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/FragmentCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'FragmentCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_FragmentCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_FragmentCanvas[] = { - "FragmentCanvas\0\0modified()\0" -}; - -void FragmentCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - FragmentCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData FragmentCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject FragmentCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_FragmentCanvas, - qt_meta_data_FragmentCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &FragmentCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *FragmentCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *FragmentCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_FragmentCanvas)) - return static_cast(const_cast< FragmentCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< FragmentCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int FragmentCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_FragmentDialog.cpp b/src/moc_FragmentDialog.cpp deleted file mode 100644 index 9b6bff0c8..000000000 --- a/src/moc_FragmentDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'FragmentDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/FragmentDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'FragmentDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_FragmentDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 25, 15, 15, 15, 0x09, - 34, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_FragmentDialog[] = { - "FragmentDialog\0\0polish()\0accept()\0" - "menu_refer()\0" -}; - -void FragmentDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - FragmentDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->menu_refer(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData FragmentDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject FragmentDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_FragmentDialog, - qt_meta_data_FragmentDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &FragmentDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *FragmentDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *FragmentDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_FragmentDialog)) - return static_cast(const_cast< FragmentDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int FragmentDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_GenerationSettingsBuiltinTable.cpp b/src/moc_GenerationSettingsBuiltinTable.cpp deleted file mode 100644 index e25376b8b..000000000 --- a/src/moc_GenerationSettingsBuiltinTable.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'GenerationSettingsBuiltinTable.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/GenerationSettingsBuiltinTable.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'GenerationSettingsBuiltinTable.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_BuiltinTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 8, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x0a, - 31, 13, 13, 13, 0x0a, - 44, 13, 13, 13, 0x0a, - 58, 13, 13, 13, 0x0a, - 70, 13, 13, 13, 0x0a, - 81, 13, 13, 13, 0x0a, - 108, 13, 13, 13, 0x0a, - 135, 13, 13, 13, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_BuiltinTable[] = { - "BuiltinTable\0\0OnInsertNewRow()\0" - "OnPasteRow()\0OnDeleteRow()\0OnCopyRow()\0" - "OnCutRow()\0OnCallRowMenu(QModelIndex)\0" - "OnSetParameterVisibility()\0" - "OnFilterTable(QString)\0" -}; - -void BuiltinTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - BuiltinTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->OnInsertNewRow(); break; - case 1: _t->OnPasteRow(); break; - case 2: _t->OnDeleteRow(); break; - case 3: _t->OnCopyRow(); break; - case 4: _t->OnCutRow(); break; - case 5: _t->OnCallRowMenu((*reinterpret_cast< const QModelIndex(*)>(_a[1]))); break; - case 6: _t->OnSetParameterVisibility(); break; - case 7: _t->OnFilterTable((*reinterpret_cast< QString(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData BuiltinTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject BuiltinTable::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_BuiltinTable, - qt_meta_data_BuiltinTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &BuiltinTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *BuiltinTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *BuiltinTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_BuiltinTable)) - return static_cast(const_cast< BuiltinTable*>(this)); - return QWidget::qt_metacast(_clname); -} - -int BuiltinTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QWidget::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 8) - qt_static_metacall(this, _c, _id, _a); - _id -= 8; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_GenerationSettingsDialog.cpp b/src/moc_GenerationSettingsDialog.cpp deleted file mode 100644 index 0f4ee2617..000000000 --- a/src/moc_GenerationSettingsDialog.cpp +++ /dev/null @@ -1,160 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'GenerationSettingsDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/GenerationSettingsDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'GenerationSettingsDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_GenerationSettingsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 27, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 26, 25, 25, 25, 0x09, - 35, 25, 25, 25, 0x09, - 44, 25, 25, 25, 0x09, - 53, 25, 25, 25, 0x09, - 70, 25, 25, 25, 0x09, - 88, 25, 25, 25, 0x09, - 105, 25, 25, 25, 0x09, - 125, 25, 25, 25, 0x09, - 142, 25, 25, 25, 0x09, - 157, 25, 25, 25, 0x09, - 173, 25, 25, 25, 0x09, - 188, 25, 25, 25, 0x09, - 206, 25, 25, 25, 0x09, - 221, 25, 25, 25, 0x09, - 248, 25, 25, 25, 0x09, - 275, 25, 25, 25, 0x09, - 301, 25, 25, 25, 0x09, - 327, 25, 25, 25, 0x09, - 349, 25, 25, 25, 0x09, - 371, 25, 25, 25, 0x09, - 394, 25, 25, 25, 0x09, - 417, 25, 25, 25, 0x09, - 439, 25, 25, 25, 0x09, - 461, 25, 25, 25, 0x09, - 486, 25, 25, 25, 0x09, - 511, 25, 25, 25, 0x09, - 533, 25, 25, 25, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_GenerationSettingsDialog[] = { - "GenerationSettingsDialog\0\0polish()\0" - "accept()\0reject()\0cpproot_browse()\0" - "javaroot_browse()\0phproot_browse()\0" - "pythonroot_browse()\0idlroot_browse()\0" - "cpp_relative()\0java_relative()\0" - "php_relative()\0python_relative()\0" - "idl_relative()\0java_get_visi_changed(int)\0" - "java_set_visi_changed(int)\0" - "php_get_visi_changed(int)\0" - "php_set_visi_changed(int)\0" - "follow_cpp_get_name()\0follow_cpp_set_name()\0" - "follow_java_get_name()\0follow_java_set_name()\0" - "follow_php_get_name()\0follow_php_set_name()\0" - "follow_python_get_name()\0" - "follow_python_set_name()\0follow_idl_get_name()\0" - "follow_idl_set_name()\0" -}; - -void GenerationSettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - GenerationSettingsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->reject(); break; - case 3: _t->cpproot_browse(); break; - case 4: _t->javaroot_browse(); break; - case 5: _t->phproot_browse(); break; - case 6: _t->pythonroot_browse(); break; - case 7: _t->idlroot_browse(); break; - case 8: _t->cpp_relative(); break; - case 9: _t->java_relative(); break; - case 10: _t->php_relative(); break; - case 11: _t->python_relative(); break; - case 12: _t->idl_relative(); break; - case 13: _t->java_get_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; - case 14: _t->java_set_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; - case 15: _t->php_get_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; - case 16: _t->php_set_visi_changed((*reinterpret_cast< int(*)>(_a[1]))); break; - case 17: _t->follow_cpp_get_name(); break; - case 18: _t->follow_cpp_set_name(); break; - case 19: _t->follow_java_get_name(); break; - case 20: _t->follow_java_set_name(); break; - case 21: _t->follow_php_get_name(); break; - case 22: _t->follow_php_set_name(); break; - case 23: _t->follow_python_get_name(); break; - case 24: _t->follow_python_set_name(); break; - case 25: _t->follow_idl_get_name(); break; - case 26: _t->follow_idl_set_name(); break; - default: ; - } - } -} - -const QMetaObjectExtraData GenerationSettingsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject GenerationSettingsDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_GenerationSettingsDialog, - qt_meta_data_GenerationSettingsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &GenerationSettingsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *GenerationSettingsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *GenerationSettingsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_GenerationSettingsDialog)) - return static_cast(const_cast< GenerationSettingsDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int GenerationSettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 27) - qt_static_metacall(this, _c, _id, _a); - _id -= 27; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_GreetingsDialog.cpp b/src/moc_GreetingsDialog.cpp deleted file mode 100644 index 6a19922b6..000000000 --- a/src/moc_GreetingsDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'GreetingsDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/GreetingsDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'GreetingsDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_GreetingsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 17, 16, 16, 0x09, - 44, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_GreetingsDialog[] = { - "GreetingsDialog\0\0e\0closeEvent(QCloseEvent*)\0" - "valid_ok()\0" -}; - -void GreetingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - GreetingsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->closeEvent((*reinterpret_cast< QCloseEvent*(*)>(_a[1]))); break; - case 1: _t->valid_ok(); break; - default: ; - } - } -} - -const QMetaObjectExtraData GreetingsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject GreetingsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_GreetingsDialog, - qt_meta_data_GreetingsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &GreetingsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *GreetingsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *GreetingsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_GreetingsDialog)) - return static_cast(const_cast< GreetingsDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int GreetingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_HelpDialog.cpp b/src/moc_HelpDialog.cpp deleted file mode 100644 index 4c471aa79..000000000 --- a/src/moc_HelpDialog.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'HelpDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/HelpDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'HelpDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_HelpDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_HelpDialog[] = { - "HelpDialog\0" -}; - -void HelpDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData HelpDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject HelpDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_HelpDialog, - qt_meta_data_HelpDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &HelpDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *HelpDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *HelpDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_HelpDialog)) - return static_cast(const_cast< HelpDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int HelpDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_HelpRegexpDialog.cpp b/src/moc_HelpRegexpDialog.cpp deleted file mode 100644 index 69a13dbb1..000000000 --- a/src/moc_HelpRegexpDialog.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'HelpRegexpDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/HelpRegexpDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'HelpRegexpDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_HelpRegexpDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_HelpRegexpDialog[] = { - "HelpRegexpDialog\0" -}; - -void HelpRegexpDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData HelpRegexpDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject HelpRegexpDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_HelpRegexpDialog, - qt_meta_data_HelpRegexpDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &HelpRegexpDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *HelpRegexpDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *HelpRegexpDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_HelpRegexpDialog)) - return static_cast(const_cast< HelpRegexpDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int HelpRegexpDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_HideShowDialog.cpp b/src/moc_HideShowDialog.cpp deleted file mode 100644 index 73ed02df1..000000000 --- a/src/moc_HideShowDialog.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'HideShowDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/HideShowDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'HideShowDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_HideShowDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 8, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 25, 15, 15, 15, 0x09, - 37, 15, 15, 15, 0x09, - 49, 15, 15, 15, 0x09, - 60, 15, 15, 15, 0x09, - 71, 15, 15, 15, 0x09, - 86, 15, 15, 15, 0x09, - 111, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_HideShowDialog[] = { - "HideShowDialog\0\0polish()\0hide_them()\0" - "show_them()\0show_all()\0hide_all()\0" - "hide_private()\0hide_private_protected()\0" - "accept()\0" -}; - -void HideShowDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - HideShowDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->hide_them(); break; - case 2: _t->show_them(); break; - case 3: _t->show_all(); break; - case 4: _t->hide_all(); break; - case 5: _t->hide_private(); break; - case 6: _t->hide_private_protected(); break; - case 7: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData HideShowDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject HideShowDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_HideShowDialog, - qt_meta_data_HideShowDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &HideShowDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *HideShowDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *HideShowDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_HideShowDialog)) - return static_cast(const_cast< HideShowDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int HideShowDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 8) - qt_static_metacall(this, _c, _id, _a); - _id -= 8; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_IconCanvas.cpp b/src/moc_IconCanvas.cpp deleted file mode 100644 index d4fcf181a..000000000 --- a/src/moc_IconCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'IconCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/IconCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'IconCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_IconCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_IconCanvas[] = { - "IconCanvas\0\0deleted()\0" -}; - -void IconCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - IconCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData IconCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject IconCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_IconCanvas, - qt_meta_data_IconCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &IconCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *IconCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *IconCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_IconCanvas)) - return static_cast(const_cast< IconCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< IconCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int IconCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ImageDialog.cpp b/src/moc_ImageDialog.cpp deleted file mode 100644 index 828463a34..000000000 --- a/src/moc_ImageDialog.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ImageDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ImageDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ImageDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ImageDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x09, - 22, 12, 12, 12, 0x09, - 31, 12, 12, 12, 0x09, - 47, 12, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ImageDialog[] = { - "ImageDialog\0\0accept()\0browse()\0" - "root_relative()\0prj_relative()\0" -}; - -void ImageDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ImageDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->accept(); break; - case 1: _t->browse(); break; - case 2: _t->root_relative(); break; - case 3: _t->prj_relative(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ImageDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ImageDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_ImageDialog, - qt_meta_data_ImageDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ImageDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ImageDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ImageDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ImageDialog)) - return static_cast(const_cast< ImageDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int ImageDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_InstanceDialog.cpp b/src/moc_InstanceDialog.cpp deleted file mode 100644 index d92e57736..000000000 --- a/src/moc_InstanceDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'InstanceDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/InstanceDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'InstanceDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_InstanceDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 28, 15, 15, 15, 0x09, - 37, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_InstanceDialog[] = { - "InstanceDialog\0\0menu_type()\0polish()\0" - "accept()\0" -}; - -void InstanceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - InstanceDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->menu_type(); break; - case 1: _t->polish(); break; - case 2: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData InstanceDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject InstanceDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_InstanceDialog, - qt_meta_data_InstanceDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &InstanceDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *InstanceDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *InstanceDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_InstanceDialog)) - return static_cast(const_cast< InstanceDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int InstanceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_InterruptibleActivityRegionCanvas.cpp b/src/moc_InterruptibleActivityRegionCanvas.cpp deleted file mode 100644 index 0c23a5777..000000000 --- a/src/moc_InterruptibleActivityRegionCanvas.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'InterruptibleActivityRegionCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/InterruptibleActivityRegionCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'InterruptibleActivityRegionCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_InterruptibleActivityRegionCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 35, 34, 34, 34, 0x08, - 46, 34, 34, 34, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_InterruptibleActivityRegionCanvas[] = { - "InterruptibleActivityRegionCanvas\0\0" - "modified()\0deleted()\0" -}; - -void InterruptibleActivityRegionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - InterruptibleActivityRegionCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData InterruptibleActivityRegionCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject InterruptibleActivityRegionCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_InterruptibleActivityRegionCanvas, - qt_meta_data_InterruptibleActivityRegionCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &InterruptibleActivityRegionCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *InterruptibleActivityRegionCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *InterruptibleActivityRegionCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_InterruptibleActivityRegionCanvas)) - return static_cast(const_cast< InterruptibleActivityRegionCanvas*>(this)); - if (!strcmp(_clname, "ActivityContainerCanvas")) - return static_cast< ActivityContainerCanvas*>(const_cast< InterruptibleActivityRegionCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int InterruptibleActivityRegionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_MLEDialog.cpp b/src/moc_MLEDialog.cpp deleted file mode 100644 index 434f4fb9e..000000000 --- a/src/moc_MLEDialog.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'MLEDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/MLEDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'MLEDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_MLEDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_MLEDialog[] = { - "MLEDialog\0" -}; - -void MLEDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData MLEDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject MLEDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_MLEDialog, - qt_meta_data_MLEDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &MLEDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *MLEDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *MLEDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_MLEDialog)) - return static_cast(const_cast< MLEDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int MLEDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_MultiPurposeDragArea.cpp b/src/moc_MultiPurposeDragArea.cpp deleted file mode 100644 index cc9ce5000..000000000 --- a/src/moc_MultiPurposeDragArea.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'MultiPurposeDragArea.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "CustomWidgets/MultiPurposeDragArea.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'MultiPurposeDragArea.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_MultiPurposeDragArea[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 6, // signalCount - - // signals: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x05, - 43, 21, 21, 21, 0x05, - 66, 21, 21, 21, 0x05, - 78, 21, 21, 21, 0x05, - 88, 21, 21, 21, 0x05, - 111, 21, 21, 21, 0x05, - - 0 // eod -}; - -static const char qt_meta_stringdata_MultiPurposeDragArea[] = { - "MultiPurposeDragArea\0\0initiateMove(QPoint)\0" - "initiateResize(QPoint)\0endResize()\0" - "endMove()\0newCoordinates(QPoint)\0" - "changeTab(int)\0" -}; - -void MultiPurposeDragArea::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - MultiPurposeDragArea *_t = static_cast(_o); - switch (_id) { - case 0: _t->initiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 1: _t->initiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 2: _t->endResize(); break; - case 3: _t->endMove(); break; - case 4: _t->newCoordinates((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 5: _t->changeTab((*reinterpret_cast< int(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData MultiPurposeDragArea::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject MultiPurposeDragArea::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_MultiPurposeDragArea, - qt_meta_data_MultiPurposeDragArea, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &MultiPurposeDragArea::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *MultiPurposeDragArea::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *MultiPurposeDragArea::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_MultiPurposeDragArea)) - return static_cast(const_cast< MultiPurposeDragArea*>(this)); - return QWidget::qt_metacast(_clname); -} - -int MultiPurposeDragArea::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QWidget::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) - qt_static_metacall(this, _c, _id, _a); - _id -= 6; - } - return _id; -} - -// SIGNAL 0 -void MultiPurposeDragArea::initiateMove(QPoint _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 0, _a); -} - -// SIGNAL 1 -void MultiPurposeDragArea::initiateResize(QPoint _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 1, _a); -} - -// SIGNAL 2 -void MultiPurposeDragArea::endResize() -{ - QMetaObject::activate(this, &staticMetaObject, 2, 0); -} - -// SIGNAL 3 -void MultiPurposeDragArea::endMove() -{ - QMetaObject::activate(this, &staticMetaObject, 3, 0); -} - -// SIGNAL 4 -void MultiPurposeDragArea::newCoordinates(QPoint _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 4, _a); -} - -// SIGNAL 5 -void MultiPurposeDragArea::changeTab(int _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 5, _a); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_MyInputDialog.cpp b/src/moc_MyInputDialog.cpp deleted file mode 100644 index 933055267..000000000 --- a/src/moc_MyInputDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'MyInputDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/MyInputDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'MyInputDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_MyInputDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x09, - 24, 14, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_MyInputDialog[] = { - "MyInputDialog\0\0polish()\0accept()\0" -}; - -void MyInputDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - MyInputDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData MyInputDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject MyInputDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_MyInputDialog, - qt_meta_data_MyInputDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &MyInputDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *MyInputDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *MyInputDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_MyInputDialog)) - return static_cast(const_cast< MyInputDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int MyInputDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_MyTable.cpp b/src/moc_MyTable.cpp deleted file mode 100644 index 8a55182b4..000000000 --- a/src/moc_MyTable.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'MyTable.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/MyTable.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'MyTable.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_MyTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_MyTable[] = { - "MyTable\0" -}; - -void MyTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData MyTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject MyTable::staticMetaObject = { - { &Q3Table::staticMetaObject, qt_meta_stringdata_MyTable, - qt_meta_data_MyTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &MyTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *MyTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *MyTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_MyTable)) - return static_cast(const_cast< MyTable*>(this)); - return Q3Table::qt_metacast(_clname); -} - -int MyTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3Table::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_NoteCanvas.cpp b/src/moc_NoteCanvas.cpp deleted file mode 100644 index c0aa821d4..000000000 --- a/src/moc_NoteCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'NoteCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/NoteCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'NoteCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_NoteCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_NoteCanvas[] = { - "NoteCanvas\0\0modified()\0" -}; - -void NoteCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - NoteCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData NoteCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject NoteCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_NoteCanvas, - qt_meta_data_NoteCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &NoteCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *NoteCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *NoteCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_NoteCanvas)) - return static_cast(const_cast< NoteCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< NoteCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int NoteCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ObjectDiagramWindow.cpp b/src/moc_ObjectDiagramWindow.cpp deleted file mode 100644 index 34c6d57a0..000000000 --- a/src/moc_ObjectDiagramWindow.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ObjectDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ObjectDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ObjectDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ObjectDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 9, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 20, 20, 20, 0x09, - 33, 20, 20, 20, 0x09, - 53, 20, 20, 20, 0x09, - 67, 20, 20, 20, 0x09, - 82, 20, 20, 20, 0x09, - 93, 20, 20, 20, 0x09, - 104, 20, 20, 20, 0x09, - 117, 20, 20, 20, 0x09, - 128, 20, 20, 20, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ObjectDiagramWindow[] = { - "ObjectDiagramWindow\0\0hit_class()\0" - "hit_classinstance()\0hit_package()\0" - "hit_fragment()\0hit_link()\0hit_note()\0" - "hit_anchor()\0hit_text()\0hit_image()\0" -}; - -void ObjectDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ObjectDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_class(); break; - case 1: _t->hit_classinstance(); break; - case 2: _t->hit_package(); break; - case 3: _t->hit_fragment(); break; - case 4: _t->hit_link(); break; - case 5: _t->hit_note(); break; - case 6: _t->hit_anchor(); break; - case 7: _t->hit_text(); break; - case 8: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ObjectDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ObjectDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_ObjectDiagramWindow, - qt_meta_data_ObjectDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ObjectDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ObjectDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ObjectDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ObjectDiagramWindow)) - return static_cast(const_cast< ObjectDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int ObjectDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 9) - qt_static_metacall(this, _c, _id, _a); - _id -= 9; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ObjectLinkCanvas.cpp b/src/moc_ObjectLinkCanvas.cpp deleted file mode 100644 index 754c57915..000000000 --- a/src/moc_ObjectLinkCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ObjectLinkCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ObjectLinkCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ObjectLinkCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ObjectLinkCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x08, - 29, 17, 17, 17, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ObjectLinkCanvas[] = { - "ObjectLinkCanvas\0\0modified()\0deleted()\0" -}; - -void ObjectLinkCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ObjectLinkCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ObjectLinkCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ObjectLinkCanvas::staticMetaObject = { - { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_ObjectLinkCanvas, - qt_meta_data_ObjectLinkCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ObjectLinkCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ObjectLinkCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ObjectLinkCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ObjectLinkCanvas)) - return static_cast(const_cast< ObjectLinkCanvas*>(this)); - return ArrowCanvas::qt_metacast(_clname); -} - -int ObjectLinkCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ArrowCanvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ObjectLinkDialog.cpp b/src/moc_ObjectLinkDialog.cpp deleted file mode 100644 index 4ac99b710..000000000 --- a/src/moc_ObjectLinkDialog.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ObjectLinkDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ObjectLinkDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ObjectLinkDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ObjectLinkDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - 27, 17, 17, 17, 0x09, - 36, 17, 17, 17, 0x09, - 47, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ObjectLinkDialog[] = { - "ObjectLinkDialog\0\0polish()\0accept()\0" - "unselect()\0create()\0" -}; - -void ObjectLinkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ObjectLinkDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->unselect(); break; - case 3: _t->create(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ObjectLinkDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ObjectLinkDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_ObjectLinkDialog, - qt_meta_data_ObjectLinkDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ObjectLinkDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ObjectLinkDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ObjectLinkDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ObjectLinkDialog)) - return static_cast(const_cast< ObjectLinkDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int ObjectLinkDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_OdClassInstCanvas.cpp b/src/moc_OdClassInstCanvas.cpp deleted file mode 100644 index eaee2ec38..000000000 --- a/src/moc_OdClassInstCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'OdClassInstCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/OdClassInstCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'OdClassInstCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_OdClassInstCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x08, - 30, 18, 18, 18, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_OdClassInstCanvas[] = { - "OdClassInstCanvas\0\0modified()\0deleted()\0" -}; - -void OdClassInstCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - OdClassInstCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData OdClassInstCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject OdClassInstCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_OdClassInstCanvas, - qt_meta_data_OdClassInstCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &OdClassInstCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *OdClassInstCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *OdClassInstCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_OdClassInstCanvas)) - return static_cast(const_cast< OdClassInstCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< OdClassInstCanvas*>(this)); - if (!strcmp(_clname, "ClassInstCanvas")) - return static_cast< ClassInstCanvas*>(const_cast< OdClassInstCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int OdClassInstCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_OperationData.cpp b/src/moc_OperationData.cpp deleted file mode 100644 index 3c67fbbcd..000000000 --- a/src/moc_OperationData.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'OperationData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/OperationData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'OperationData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_OperationData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_OperationData[] = { - "OperationData\0\0on_delete()\0" -}; - -void OperationData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - OperationData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData OperationData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject OperationData::staticMetaObject = { - { &ClassMemberData::staticMetaObject, qt_meta_stringdata_OperationData, - qt_meta_data_OperationData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &OperationData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *OperationData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *OperationData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_OperationData)) - return static_cast(const_cast< OperationData*>(this)); - if (!strcmp(_clname, "Labeled")) - return static_cast< Labeled*>(const_cast< OperationData*>(this)); - if (!strcmp(_clname, "MultipleDependency")) - return static_cast< MultipleDependency*>(const_cast< OperationData*>(this)); - return ClassMemberData::qt_metacast(_clname); -} - -int OperationData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ClassMemberData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_OperationDialog.cpp b/src/moc_OperationDialog.cpp deleted file mode 100644 index dffabe24b..000000000 --- a/src/moc_OperationDialog.cpp +++ /dev/null @@ -1,832 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'OperationDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/OperationDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'OperationDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_OperationDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 51, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - 35, 16, 16, 16, 0x09, - 57, 16, 16, 16, 0x09, - 76, 16, 16, 16, 0x09, - 97, 94, 16, 16, 0x09, - 121, 94, 16, 16, 0x09, - 144, 94, 16, 16, 0x09, - 171, 16, 16, 16, 0x09, - 190, 16, 16, 16, 0x09, - 210, 16, 16, 16, 0x09, - 230, 16, 16, 16, 0x09, - 248, 16, 16, 16, 0x09, - 270, 16, 16, 16, 0x09, - 290, 16, 16, 16, 0x09, - 308, 16, 16, 16, 0x09, - 327, 16, 16, 16, 0x09, - 344, 16, 16, 16, 0x09, - 365, 16, 16, 16, 0x09, - 381, 94, 16, 16, 0x09, - 410, 94, 16, 16, 0x09, - 431, 94, 16, 16, 0x09, - 453, 94, 16, 16, 0x09, - 474, 94, 16, 16, 0x09, - 494, 94, 16, 16, 0x09, - 515, 94, 16, 16, 0x09, - 538, 94, 16, 16, 0x09, - 560, 16, 16, 16, 0x09, - 579, 16, 16, 16, 0x09, - 599, 16, 16, 16, 0x09, - 617, 16, 16, 16, 0x09, - 634, 16, 16, 16, 0x09, - 657, 94, 16, 16, 0x09, - 694, 16, 16, 16, 0x09, - 712, 16, 16, 16, 0x09, - 731, 16, 16, 16, 0x09, - 748, 16, 16, 16, 0x09, - 764, 94, 16, 16, 0x09, - 788, 16, 16, 16, 0x09, - 805, 16, 16, 16, 0x09, - 826, 16, 16, 16, 0x09, - 848, 16, 16, 16, 0x09, - 868, 16, 16, 16, 0x09, - 887, 16, 16, 16, 0x09, - 907, 16, 16, 16, 0x09, - 931, 16, 16, 16, 0x09, - 949, 16, 16, 16, 0x09, - 968, 16, 16, 16, 0x09, - 986, 94, 16, 16, 0x09, - 1007, 16, 16, 16, 0x09, - 1033, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_OperationDialog[] = { - "OperationDialog\0\0polish()\0accept()\0" - "default_description()\0edit_description()\0" - "edit_constraint()\0on\0classoper_toggled(bool)\0" - "abstract_toggled(bool)\0" - "forcegenbody_toggled(bool)\0" - "cpp_default_decl()\0cpp_decl_from_def()\0" - "cpp_unmapped_decl()\0cpp_update_decl()\0" - "cpp_edit_param_decl()\0cpp_def_from_decl()\0" - "cpp_default_def()\0cpp_unmapped_def()\0" - "cpp_update_def()\0cpp_edit_param_def()\0" - "cpp_edit_body()\0const_volatile_toggled(bool)\0" - "friend_toggled(bool)\0virtual_toggled(bool)\0" - "inline_toggled(bool)\0final_toggled(bool)\0" - "delete_toggled(bool)\0override_toggled(bool)\0" - "default_toggled(bool)\0java_default_def()\0" - "java_unmapped_def()\0java_update_def()\0" - "java_edit_body()\0java_edit_annotation()\0" - "java_finalsynchronized_toggled(bool)\0" - "php_default_def()\0php_unmapped_def()\0" - "php_update_def()\0php_edit_body()\0" - "php_final_toggled(bool)\0php_edit_param()\0" - "python_default_def()\0python_unmapped_def()\0" - "python_update_def()\0python_edit_body()\0" - "python_edit_param()\0python_edit_decorator()\0" - "idl_default_def()\0idl_unmapped_def()\0" - "idl_update_decl()\0oneway_toggled(bool)\0" - "update_all_tabs(QWidget*)\0menu_returntype()\0" -}; - -void OperationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - OperationDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->default_description(); break; - case 3: _t->edit_description(); break; - case 4: _t->edit_constraint(); break; - case 5: _t->classoper_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 6: _t->abstract_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 7: _t->forcegenbody_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 8: _t->cpp_default_decl(); break; - case 9: _t->cpp_decl_from_def(); break; - case 10: _t->cpp_unmapped_decl(); break; - case 11: _t->cpp_update_decl(); break; - case 12: _t->cpp_edit_param_decl(); break; - case 13: _t->cpp_def_from_decl(); break; - case 14: _t->cpp_default_def(); break; - case 15: _t->cpp_unmapped_def(); break; - case 16: _t->cpp_update_def(); break; - case 17: _t->cpp_edit_param_def(); break; - case 18: _t->cpp_edit_body(); break; - case 19: _t->const_volatile_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 20: _t->friend_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 21: _t->virtual_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 22: _t->inline_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 23: _t->final_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 24: _t->delete_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 25: _t->override_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 26: _t->default_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 27: _t->java_default_def(); break; - case 28: _t->java_unmapped_def(); break; - case 29: _t->java_update_def(); break; - case 30: _t->java_edit_body(); break; - case 31: _t->java_edit_annotation(); break; - case 32: _t->java_finalsynchronized_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 33: _t->php_default_def(); break; - case 34: _t->php_unmapped_def(); break; - case 35: _t->php_update_def(); break; - case 36: _t->php_edit_body(); break; - case 37: _t->php_final_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 38: _t->php_edit_param(); break; - case 39: _t->python_default_def(); break; - case 40: _t->python_unmapped_def(); break; - case 41: _t->python_update_def(); break; - case 42: _t->python_edit_body(); break; - case 43: _t->python_edit_param(); break; - case 44: _t->python_edit_decorator(); break; - case 45: _t->idl_default_def(); break; - case 46: _t->idl_unmapped_def(); break; - case 47: _t->idl_update_decl(); break; - case 48: _t->oneway_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 49: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - case 50: _t->menu_returntype(); break; - default: ; - } - } -} - -const QMetaObjectExtraData OperationDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject OperationDialog::staticMetaObject = { - { &EdgeMenuDialog::staticMetaObject, qt_meta_stringdata_OperationDialog, - qt_meta_data_OperationDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &OperationDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *OperationDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *OperationDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_OperationDialog)) - return static_cast(const_cast< OperationDialog*>(this)); - return EdgeMenuDialog::qt_metacast(_clname); -} - -int OperationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = EdgeMenuDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 51) - qt_static_metacall(this, _c, _id, _a); - _id -= 51; - } - return _id; -} -static const uint qt_meta_data_ParamsTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 37, 13, 12, 12, 0x09, - 80, 72, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ParamsTable[] = { - "ParamsTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0value_changed(int,int)\0" -}; - -void ParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ParamsTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ParamsTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ParamsTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_ParamsTable, - qt_meta_data_ParamsTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ParamsTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ParamsTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ParamsTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ParamsTable)) - return static_cast(const_cast< ParamsTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int ParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_ExceptionsTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 41, 17, 16, 16, 0x09, - 84, 76, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ExceptionsTable[] = { - "ExceptionsTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0value_changed(int,int)\0" -}; - -void ExceptionsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ExceptionsTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ExceptionsTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ExceptionsTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_ExceptionsTable, - qt_meta_data_ExceptionsTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ExceptionsTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ExceptionsTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ExceptionsTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ExceptionsTable)) - return static_cast(const_cast< ExceptionsTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int ExceptionsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_CppParamsTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 40, 16, 15, 15, 0x09, - 83, 75, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_CppParamsTable[] = { - "CppParamsTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0setCurrentCell(int,int)\0" -}; - -void CppParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CppParamsTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->setCurrentCell((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData CppParamsTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CppParamsTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_CppParamsTable, - qt_meta_data_CppParamsTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CppParamsTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CppParamsTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CppParamsTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CppParamsTable)) - return static_cast(const_cast< CppParamsTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int CppParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_CppParamsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_CppParamsDialog[] = { - "CppParamsDialog\0\0polish()\0accept()\0" -}; - -void CppParamsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CppParamsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData CppParamsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CppParamsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_CppParamsDialog, - qt_meta_data_CppParamsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CppParamsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CppParamsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CppParamsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CppParamsDialog)) - return static_cast(const_cast< CppParamsDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int CppParamsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_PhpParamsTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 40, 16, 15, 15, 0x09, - 83, 75, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PhpParamsTable[] = { - "PhpParamsTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0setCurrentCell(int,int)\0" -}; - -void PhpParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PhpParamsTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->setCurrentCell((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData PhpParamsTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PhpParamsTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_PhpParamsTable, - qt_meta_data_PhpParamsTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PhpParamsTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PhpParamsTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PhpParamsTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PhpParamsTable)) - return static_cast(const_cast< PhpParamsTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int PhpParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_PhpParamsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PhpParamsDialog[] = { - "PhpParamsDialog\0\0polish()\0accept()\0" -}; - -void PhpParamsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PhpParamsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PhpParamsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PhpParamsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_PhpParamsDialog, - qt_meta_data_PhpParamsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PhpParamsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PhpParamsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PhpParamsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PhpParamsDialog)) - return static_cast(const_cast< PhpParamsDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int PhpParamsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_PythonParamsTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 43, 19, 18, 18, 0x09, - 86, 78, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PythonParamsTable[] = { - "PythonParamsTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0setCurrentCell(int,int)\0" -}; - -void PythonParamsTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PythonParamsTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->setCurrentCell((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData PythonParamsTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PythonParamsTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_PythonParamsTable, - qt_meta_data_PythonParamsTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PythonParamsTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PythonParamsTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PythonParamsTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PythonParamsTable)) - return static_cast(const_cast< PythonParamsTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int PythonParamsTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_PythonParamsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - 29, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PythonParamsDialog[] = { - "PythonParamsDialog\0\0polish()\0accept()\0" -}; - -void PythonParamsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PythonParamsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PythonParamsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PythonParamsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_PythonParamsDialog, - qt_meta_data_PythonParamsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PythonParamsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PythonParamsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PythonParamsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PythonParamsDialog)) - return static_cast(const_cast< PythonParamsDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int PythonParamsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_PackageCanvas.cpp b/src/moc_PackageCanvas.cpp deleted file mode 100644 index f7d092564..000000000 --- a/src/moc_PackageCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'PackageCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/PackageCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'PackageCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PackageCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x08, - 26, 14, 14, 14, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_PackageCanvas[] = { - "PackageCanvas\0\0modified()\0deleted()\0" -}; - -void PackageCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PackageCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PackageCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PackageCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_PackageCanvas, - qt_meta_data_PackageCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PackageCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PackageCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PackageCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PackageCanvas)) - return static_cast(const_cast< PackageCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< PackageCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int PackageCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_PackageDialog.cpp b/src/moc_PackageDialog.cpp deleted file mode 100644 index 0df7ab225..000000000 --- a/src/moc_PackageDialog.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'PackageDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/PackageDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'PackageDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PackageDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 17, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x09, - 24, 14, 14, 14, 0x09, - 33, 14, 14, 14, 0x09, - 52, 14, 14, 14, 0x09, - 83, 14, 14, 14, 0x09, - 99, 14, 14, 14, 0x09, - 113, 14, 14, 14, 0x09, - 127, 14, 14, 14, 0x09, - 140, 14, 14, 14, 0x09, - 156, 14, 14, 14, 0x09, - 169, 14, 14, 14, 0x09, - 187, 14, 14, 14, 0x09, - 203, 14, 14, 14, 0x09, - 219, 14, 14, 14, 0x09, - 234, 14, 14, 14, 0x09, - 252, 14, 14, 14, 0x09, - 267, 14, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PackageDialog[] = { - "PackageDialog\0\0polish()\0accept()\0" - "edit_description()\0edStereotypeActivated(QString)\0" - "cppsrc_browse()\0cpph_browse()\0" - "java_browse()\0php_browse()\0python_browse()\0" - "idl_browse()\0cppsrc_relative()\0" - "cpph_relative()\0java_relative()\0" - "php_relative()\0python_relative()\0" - "idl_relative()\0change_tabs(QWidget*)\0" -}; - -void PackageDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PackageDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->edStereotypeActivated((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 4: _t->cppsrc_browse(); break; - case 5: _t->cpph_browse(); break; - case 6: _t->java_browse(); break; - case 7: _t->php_browse(); break; - case 8: _t->python_browse(); break; - case 9: _t->idl_browse(); break; - case 10: _t->cppsrc_relative(); break; - case 11: _t->cpph_relative(); break; - case 12: _t->java_relative(); break; - case 13: _t->php_relative(); break; - case 14: _t->python_relative(); break; - case 15: _t->idl_relative(); break; - case 16: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData PackageDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PackageDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_PackageDialog, - qt_meta_data_PackageDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PackageDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PackageDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PackageDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PackageDialog)) - return static_cast(const_cast< PackageDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int PackageDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 17) - qt_static_metacall(this, _c, _id, _a); - _id -= 17; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterCanvas.cpp b/src/moc_ParameterCanvas.cpp deleted file mode 100644 index 48e89c65b..000000000 --- a/src/moc_ParameterCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ParameterCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ParameterCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ParameterCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ParameterCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x08, - 28, 16, 16, 16, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ParameterCanvas[] = { - "ParameterCanvas\0\0modified()\0deleted()\0" -}; - -void ParameterCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ParameterCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ParameterCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ParameterCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ParameterCanvas, - qt_meta_data_ParameterCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ParameterCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ParameterCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ParameterCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ParameterCanvas)) - return static_cast(const_cast< ParameterCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ParameterCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ParameterCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterData.cpp b/src/moc_ParameterData.cpp deleted file mode 100644 index 8fbc9c213..000000000 --- a/src/moc_ParameterData.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ParameterData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ParameterData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ParameterData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ParameterData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ParameterData[] = { - "ParameterData\0\0on_delete()\0" -}; - -void ParameterData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ParameterData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ParameterData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ParameterData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_ParameterData, - qt_meta_data_ParameterData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ParameterData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ParameterData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ParameterData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ParameterData)) - return static_cast(const_cast< ParameterData*>(this)); - if (!strcmp(_clname, "PinParamData")) - return static_cast< PinParamData*>(const_cast< ParameterData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int ParameterData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterDialog.cpp b/src/moc_ParameterDialog.cpp deleted file mode 100644 index a69cd9d07..000000000 --- a/src/moc_ParameterDialog.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ParameterDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ParameterDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ParameterDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ParameterDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 9, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - 35, 16, 16, 16, 0x09, - 47, 16, 16, 16, 0x09, - 66, 16, 16, 16, 0x09, - 87, 16, 16, 16, 0x09, - 108, 16, 16, 16, 0x09, - 130, 16, 16, 16, 0x09, - 142, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ParameterDialog[] = { - "ParameterDialog\0\0polish()\0accept()\0" - "edit_init()\0edit_description()\0" - "edit_uml_selection()\0edit_cpp_selection()\0" - "edit_java_selection()\0menu_type()\0" - "change_tabs(QWidget*)\0" -}; - -void ParameterDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ParameterDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_init(); break; - case 3: _t->edit_description(); break; - case 4: _t->edit_uml_selection(); break; - case 5: _t->edit_cpp_selection(); break; - case 6: _t->edit_java_selection(); break; - case 7: _t->menu_type(); break; - case 8: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ParameterDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ParameterDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ParameterDialog, - qt_meta_data_ParameterDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ParameterDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ParameterDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ParameterDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ParameterDialog)) - return static_cast(const_cast< ParameterDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ParameterDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 9) - qt_static_metacall(this, _c, _id, _a); - _id -= 9; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterSetCanvas.cpp b/src/moc_ParameterSetCanvas.cpp deleted file mode 100644 index 2ad89ead0..000000000 --- a/src/moc_ParameterSetCanvas.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ParameterSetCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/ParameterSetCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ParameterSetCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ParameterSetCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x08, - 31, 19, 19, 19, 0x08, - 41, 19, 19, 19, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_ParameterSetCanvas[] = { - "ParameterSetCanvas\0\0modified()\0deleted()\0" - "pin_deleted()\0" -}; - -void ParameterSetCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ParameterSetCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - case 2: _t->pin_deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ParameterSetCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ParameterSetCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ParameterSetCanvas, - qt_meta_data_ParameterSetCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ParameterSetCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ParameterSetCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ParameterSetCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ParameterSetCanvas)) - return static_cast(const_cast< ParameterSetCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< ParameterSetCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int ParameterSetCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterSetData.cpp b/src/moc_ParameterSetData.cpp deleted file mode 100644 index 19c7744bc..000000000 --- a/src/moc_ParameterSetData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ParameterSetData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/ParameterSetData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ParameterSetData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ParameterSetData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ParameterSetData[] = { - "ParameterSetData\0\0check()\0" -}; - -void ParameterSetData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ParameterSetData *_t = static_cast(_o); - switch (_id) { - case 0: _t->check(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ParameterSetData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ParameterSetData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_ParameterSetData, - qt_meta_data_ParameterSetData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ParameterSetData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ParameterSetData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ParameterSetData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ParameterSetData)) - return static_cast(const_cast< ParameterSetData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int ParameterSetData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ParameterSetDialog.cpp b/src/moc_ParameterSetDialog.cpp deleted file mode 100644 index cd7462b0a..000000000 --- a/src/moc_ParameterSetDialog.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ParameterSetDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ParameterSetDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ParameterSetDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ParameterSetDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - 29, 19, 19, 19, 0x09, - 38, 19, 19, 19, 0x09, - 57, 19, 19, 19, 0x09, - 73, 19, 19, 19, 0x09, - 91, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ParameterSetDialog[] = { - "ParameterSetDialog\0\0polish()\0accept()\0" - "edit_description()\0associate_cls()\0" - "unassociate_cls()\0change_tabs(QWidget*)\0" -}; - -void ParameterSetDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ParameterSetDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->associate_cls(); break; - case 4: _t->unassociate_cls(); break; - case 5: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ParameterSetDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ParameterSetDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ParameterSetDialog, - qt_meta_data_ParameterSetDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ParameterSetDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ParameterSetDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ParameterSetDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ParameterSetDialog)) - return static_cast(const_cast< ParameterSetDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ParameterSetDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) - qt_static_metacall(this, _c, _id, _a); - _id -= 6; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_PinCanvas.cpp b/src/moc_PinCanvas.cpp deleted file mode 100644 index 3053e6280..000000000 --- a/src/moc_PinCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'PinCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/PinCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'PinCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PinCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x08, - 22, 10, 10, 10, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_PinCanvas[] = { - "PinCanvas\0\0modified()\0deleted()\0" -}; - -void PinCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PinCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PinCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PinCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_PinCanvas, - qt_meta_data_PinCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PinCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PinCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PinCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PinCanvas)) - return static_cast(const_cast< PinCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< PinCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int PinCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_PinDialog.cpp b/src/moc_PinDialog.cpp deleted file mode 100644 index da6077960..000000000 --- a/src/moc_PinDialog.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'PinDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/PinDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'PinDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PinDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 8, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x09, - 20, 10, 10, 10, 0x09, - 29, 10, 10, 10, 0x09, - 48, 10, 10, 10, 0x09, - 69, 10, 10, 10, 0x09, - 90, 10, 10, 10, 0x09, - 112, 10, 10, 10, 0x09, - 124, 10, 10, 10, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PinDialog[] = { - "PinDialog\0\0polish()\0accept()\0" - "edit_description()\0edit_uml_selection()\0" - "edit_cpp_selection()\0edit_java_selection()\0" - "menu_type()\0change_tabs(QWidget*)\0" -}; - -void PinDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PinDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->edit_uml_selection(); break; - case 4: _t->edit_cpp_selection(); break; - case 5: _t->edit_java_selection(); break; - case 6: _t->menu_type(); break; - case 7: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData PinDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PinDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_PinDialog, - qt_meta_data_PinDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PinDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PinDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PinDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PinDialog)) - return static_cast(const_cast< PinDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int PinDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 8) - qt_static_metacall(this, _c, _id, _a); - _id -= 8; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_PseudoStateCanvas.cpp b/src/moc_PseudoStateCanvas.cpp deleted file mode 100644 index df34cd3b7..000000000 --- a/src/moc_PseudoStateCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'PseudoStateCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/PseudoStateCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'PseudoStateCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PseudoStateCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x08, - 30, 18, 18, 18, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_PseudoStateCanvas[] = { - "PseudoStateCanvas\0\0modified()\0deleted()\0" -}; - -void PseudoStateCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PseudoStateCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PseudoStateCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PseudoStateCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_PseudoStateCanvas, - qt_meta_data_PseudoStateCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PseudoStateCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PseudoStateCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PseudoStateCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PseudoStateCanvas)) - return static_cast(const_cast< PseudoStateCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< PseudoStateCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int PseudoStateCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_PseudoStateData.cpp b/src/moc_PseudoStateData.cpp deleted file mode 100644 index 8e325a9f4..000000000 --- a/src/moc_PseudoStateData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'PseudoStateData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/PseudoStateData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'PseudoStateData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PseudoStateData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PseudoStateData[] = { - "PseudoStateData\0\0on_delete()\0" -}; - -void PseudoStateData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PseudoStateData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PseudoStateData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PseudoStateData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_PseudoStateData, - qt_meta_data_PseudoStateData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PseudoStateData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PseudoStateData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PseudoStateData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PseudoStateData)) - return static_cast(const_cast< PseudoStateData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int PseudoStateData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_PseudoStateDialog.cpp b/src/moc_PseudoStateDialog.cpp deleted file mode 100644 index abbbe79bf..000000000 --- a/src/moc_PseudoStateDialog.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'PseudoStateDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/PseudoStateDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'PseudoStateDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PseudoStateDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x09, - 28, 18, 18, 18, 0x09, - 37, 18, 18, 18, 0x09, - 54, 18, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_PseudoStateDialog[] = { - "PseudoStateDialog\0\0polish()\0accept()\0" - "menu_reference()\0edit_description()\0" -}; - -void PseudoStateDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PseudoStateDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->menu_reference(); break; - case 3: _t->edit_description(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PseudoStateDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PseudoStateDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_PseudoStateDialog, - qt_meta_data_PseudoStateDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PseudoStateDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PseudoStateDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PseudoStateDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PseudoStateDialog)) - return static_cast(const_cast< PseudoStateDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int PseudoStateDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ReferenceDialog.cpp b/src/moc_ReferenceDialog.cpp deleted file mode 100644 index a25ea32b5..000000000 --- a/src/moc_ReferenceDialog.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ReferenceDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ReferenceDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ReferenceDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ReferenceDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 7, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - 26, 16, 16, 16, 0x09, - 36, 16, 16, 16, 0x09, - 45, 16, 16, 16, 0x09, - 59, 16, 16, 16, 0x09, - 73, 16, 16, 16, 0x09, - 85, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ReferenceDialog[] = { - "ReferenceDialog\0\0polish()\0compute()\0" - "select()\0selected(int)\0mark_unmark()\0" - "mark_them()\0unmark_all()\0" -}; - -void ReferenceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ReferenceDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->compute(); break; - case 2: _t->select(); break; - case 3: _t->selected((*reinterpret_cast< int(*)>(_a[1]))); break; - case 4: _t->mark_unmark(); break; - case 5: _t->mark_them(); break; - case 6: _t->unmark_all(); break; - default: ; - } - } -} - -const QMetaObjectExtraData ReferenceDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ReferenceDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_ReferenceDialog, - qt_meta_data_ReferenceDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ReferenceDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ReferenceDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ReferenceDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ReferenceDialog)) - return static_cast(const_cast< ReferenceDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int ReferenceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 7) - qt_static_metacall(this, _c, _id, _a); - _id -= 7; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_RelatedElementsDialog.cpp b/src/moc_RelatedElementsDialog.cpp deleted file mode 100644 index 36a28a89f..000000000 --- a/src/moc_RelatedElementsDialog.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'RelatedElementsDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/RelatedElementsDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'RelatedElementsDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_RelatedElementsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 23, 22, 22, 22, 0x09, - 32, 22, 22, 22, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_RelatedElementsDialog[] = { - "RelatedElementsDialog\0\0polish()\0" - "accept()\0" -}; - -void RelatedElementsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - RelatedElementsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData RelatedElementsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject RelatedElementsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_RelatedElementsDialog, - qt_meta_data_RelatedElementsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &RelatedElementsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *RelatedElementsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *RelatedElementsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_RelatedElementsDialog)) - return static_cast(const_cast< RelatedElementsDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int RelatedElementsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_RelationCanvas.cpp b/src/moc_RelationCanvas.cpp deleted file mode 100644 index 1f0a5286d..000000000 --- a/src/moc_RelationCanvas.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'RelationCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/RelationCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'RelationCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_RelationCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x08, - 27, 15, 15, 15, 0x08, - 46, 15, 15, 15, 0x08, - 56, 15, 15, 15, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_RelationCanvas[] = { - "RelationCanvas\0\0modified()\0" - "actuals_modified()\0deleted()\0" - "drawing_settings_modified()\0" -}; - -void RelationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - RelationCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->actuals_modified(); break; - case 2: _t->deleted(); break; - case 3: _t->drawing_settings_modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData RelationCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject RelationCanvas::staticMetaObject = { - { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_RelationCanvas, - qt_meta_data_RelationCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &RelationCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *RelationCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *RelationCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_RelationCanvas)) - return static_cast(const_cast< RelationCanvas*>(this)); - return ArrowCanvas::qt_metacast(_clname); -} - -int RelationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ArrowCanvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_RelationData.cpp b/src/moc_RelationData.cpp deleted file mode 100644 index 42adb40c1..000000000 --- a/src/moc_RelationData.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'RelationData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/RelationData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'RelationData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_RelationData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x09, - 28, 13, 13, 13, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_RelationData[] = { - "RelationData\0\0end_deleted()\0on_delete()\0" -}; - -void RelationData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - RelationData *_t = static_cast(_o); - switch (_id) { - case 0: _t->end_deleted(); break; - case 1: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData RelationData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject RelationData::staticMetaObject = { - { &ClassMemberData::staticMetaObject, qt_meta_stringdata_RelationData, - qt_meta_data_RelationData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &RelationData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *RelationData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *RelationData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_RelationData)) - return static_cast(const_cast< RelationData*>(this)); - if (!strcmp(_clname, "Labeled")) - return static_cast< Labeled*>(const_cast< RelationData*>(this)); - return ClassMemberData::qt_metacast(_clname); -} - -int RelationData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ClassMemberData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_RelationDialog.cpp b/src/moc_RelationDialog.cpp deleted file mode 100644 index e2579fe9c..000000000 --- a/src/moc_RelationDialog.cpp +++ /dev/null @@ -1,210 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'RelationDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/RelationDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'RelationDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_RelationDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 48, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 25, 15, 15, 15, 0x09, - 34, 15, 15, 15, 0x09, - 58, 15, 15, 15, 0x09, - 82, 15, 15, 15, 0x09, - 103, 15, 15, 15, 0x09, - 124, 15, 15, 15, 0x09, - 144, 15, 15, 15, 0x09, - 164, 15, 15, 15, 0x09, - 178, 15, 15, 15, 0x09, - 192, 15, 15, 15, 0x09, - 213, 15, 15, 15, 0x09, - 226, 15, 15, 15, 0x09, - 250, 15, 15, 15, 0x09, - 274, 15, 15, 15, 0x09, - 289, 15, 15, 15, 0x09, - 304, 15, 15, 15, 0x09, - 320, 15, 15, 15, 0x09, - 344, 15, 15, 15, 0x09, - 361, 15, 15, 15, 0x09, - 377, 15, 15, 15, 0x09, - 394, 15, 15, 15, 0x09, - 410, 15, 15, 15, 0x09, - 426, 15, 15, 15, 0x09, - 443, 15, 15, 15, 0x09, - 461, 15, 15, 15, 0x09, - 478, 15, 15, 15, 0x09, - 496, 15, 15, 15, 0x09, - 521, 15, 15, 15, 0x09, - 546, 15, 15, 15, 0x09, - 561, 15, 15, 15, 0x09, - 576, 15, 15, 15, 0x09, - 592, 15, 15, 15, 0x09, - 609, 15, 15, 15, 0x09, - 625, 15, 15, 15, 0x09, - 642, 15, 15, 15, 0x09, - 660, 15, 15, 15, 0x09, - 678, 15, 15, 15, 0x09, - 697, 15, 15, 15, 0x09, - 717, 15, 15, 15, 0x09, - 736, 15, 15, 15, 0x09, - 756, 15, 15, 15, 0x09, - 771, 15, 15, 15, 0x09, - 786, 15, 15, 15, 0x09, - 802, 15, 15, 15, 0x09, - 819, 15, 15, 15, 0x09, - 835, 15, 15, 15, 0x09, - 852, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_RelationDialog[] = { - "RelationDialog\0\0polish()\0accept()\0" - "default_description_a()\0default_description_b()\0" - "edit_description_a()\0edit_description_b()\0" - "edit_constraint_a()\0edit_constraint_b()\0" - "edit_init_a()\0edit_init_b()\0" - "edTypeActivated(int)\0menu_assoc()\0" - "derived_changed_a(bool)\0derived_changed_b(bool)\0" - "cpp_update_a()\0cpp_update_b()\0" - "cpp_default_a()\0cpp_include_in_header()\0" - "cpp_unmapped_a()\0cpp_default_b()\0" - "cpp_unmapped_b()\0java_update_a()\0" - "java_update_b()\0java_default_a()\0" - "java_unmapped_a()\0java_default_b()\0" - "java_unmapped_b()\0java_edit_annotation_a()\0" - "java_edit_annotation_b()\0php_update_a()\0" - "php_update_b()\0php_default_a()\0" - "php_unmapped_a()\0php_default_b()\0" - "php_unmapped_b()\0python_update_a()\0" - "python_update_b()\0python_default_a()\0" - "python_unmapped_a()\0python_default_b()\0" - "python_unmapped_b()\0idl_update_a()\0" - "idl_update_b()\0idl_default_a()\0" - "idl_unmapped_a()\0idl_default_b()\0" - "idl_unmapped_b()\0update_all_tabs(QWidget*)\0" -}; - -void RelationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - RelationDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->default_description_a(); break; - case 3: _t->default_description_b(); break; - case 4: _t->edit_description_a(); break; - case 5: _t->edit_description_b(); break; - case 6: _t->edit_constraint_a(); break; - case 7: _t->edit_constraint_b(); break; - case 8: _t->edit_init_a(); break; - case 9: _t->edit_init_b(); break; - case 10: _t->edTypeActivated((*reinterpret_cast< int(*)>(_a[1]))); break; - case 11: _t->menu_assoc(); break; - case 12: _t->derived_changed_a((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 13: _t->derived_changed_b((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 14: _t->cpp_update_a(); break; - case 15: _t->cpp_update_b(); break; - case 16: _t->cpp_default_a(); break; - case 17: _t->cpp_include_in_header(); break; - case 18: _t->cpp_unmapped_a(); break; - case 19: _t->cpp_default_b(); break; - case 20: _t->cpp_unmapped_b(); break; - case 21: _t->java_update_a(); break; - case 22: _t->java_update_b(); break; - case 23: _t->java_default_a(); break; - case 24: _t->java_unmapped_a(); break; - case 25: _t->java_default_b(); break; - case 26: _t->java_unmapped_b(); break; - case 27: _t->java_edit_annotation_a(); break; - case 28: _t->java_edit_annotation_b(); break; - case 29: _t->php_update_a(); break; - case 30: _t->php_update_b(); break; - case 31: _t->php_default_a(); break; - case 32: _t->php_unmapped_a(); break; - case 33: _t->php_default_b(); break; - case 34: _t->php_unmapped_b(); break; - case 35: _t->python_update_a(); break; - case 36: _t->python_update_b(); break; - case 37: _t->python_default_a(); break; - case 38: _t->python_unmapped_a(); break; - case 39: _t->python_default_b(); break; - case 40: _t->python_unmapped_b(); break; - case 41: _t->idl_update_a(); break; - case 42: _t->idl_update_b(); break; - case 43: _t->idl_default_a(); break; - case 44: _t->idl_unmapped_a(); break; - case 45: _t->idl_default_b(); break; - case 46: _t->idl_unmapped_b(); break; - case 47: _t->update_all_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData RelationDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject RelationDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_RelationDialog, - qt_meta_data_RelationDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &RelationDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *RelationDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *RelationDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_RelationDialog)) - return static_cast(const_cast< RelationDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int RelationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 48) - qt_static_metacall(this, _c, _id, _a); - _id -= 48; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_RevSettingsDialog.cpp b/src/moc_RevSettingsDialog.cpp deleted file mode 100644 index 5be8506b8..000000000 --- a/src/moc_RevSettingsDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'RevSettingsDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/RevSettingsDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'RevSettingsDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_RevSettingsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x09, - 28, 18, 18, 18, 0x09, - 37, 18, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_RevSettingsDialog[] = { - "RevSettingsDialog\0\0polish()\0accept()\0" - "show_regexp_help()\0" -}; - -void RevSettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - RevSettingsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->show_regexp_help(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData RevSettingsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject RevSettingsDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_RevSettingsDialog, - qt_meta_data_RevSettingsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &RevSettingsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *RevSettingsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *RevSettingsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_RevSettingsDialog)) - return static_cast(const_cast< RevSettingsDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int RevSettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SdClassInstCanvas.cpp b/src/moc_SdClassInstCanvas.cpp deleted file mode 100644 index cf7b53521..000000000 --- a/src/moc_SdClassInstCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SdClassInstCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/SdClassInstCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SdClassInstCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SdClassInstCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x08, - 30, 18, 18, 18, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_SdClassInstCanvas[] = { - "SdClassInstCanvas\0\0modified()\0deleted()\0" -}; - -void SdClassInstCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SdClassInstCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SdClassInstCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SdClassInstCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_SdClassInstCanvas, - qt_meta_data_SdClassInstCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SdClassInstCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SdClassInstCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SdClassInstCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SdClassInstCanvas)) - return static_cast(const_cast< SdClassInstCanvas*>(this)); - if (!strcmp(_clname, "SdObjCanvas")) - return static_cast< SdObjCanvas*>(const_cast< SdClassInstCanvas*>(this)); - if (!strcmp(_clname, "ClassInstCanvas")) - return static_cast< ClassInstCanvas*>(const_cast< SdClassInstCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int SdClassInstCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SdContinuationCanvas.cpp b/src/moc_SdContinuationCanvas.cpp deleted file mode 100644 index 60e72b728..000000000 --- a/src/moc_SdContinuationCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SdContinuationCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/SdContinuationCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SdContinuationCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SdContinuationCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_SdContinuationCanvas[] = { - "SdContinuationCanvas\0\0modified()\0" -}; - -void SdContinuationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SdContinuationCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SdContinuationCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SdContinuationCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_SdContinuationCanvas, - qt_meta_data_SdContinuationCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SdContinuationCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SdContinuationCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SdContinuationCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SdContinuationCanvas)) - return static_cast(const_cast< SdContinuationCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< SdContinuationCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int SdContinuationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SdDurationCanvas.cpp b/src/moc_SdDurationCanvas.cpp deleted file mode 100644 index c31277527..000000000 --- a/src/moc_SdDurationCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SdDurationCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/SdDurationCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SdDurationCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SdDurationCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_SdDurationCanvas[] = { - "SdDurationCanvas\0\0modified()\0" -}; - -void SdDurationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SdDurationCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SdDurationCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SdDurationCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_SdDurationCanvas, - qt_meta_data_SdDurationCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SdDurationCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SdDurationCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SdDurationCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SdDurationCanvas)) - return static_cast(const_cast< SdDurationCanvas*>(this)); - if (!strcmp(_clname, "SdMsgSupport")) - return static_cast< SdMsgSupport*>(const_cast< SdDurationCanvas*>(this)); - if (!strcmp(_clname, "SdDurationSupport")) - return static_cast< SdDurationSupport*>(const_cast< SdDurationCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int SdDurationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SdMsgBaseCanvas.cpp b/src/moc_SdMsgBaseCanvas.cpp deleted file mode 100644 index 52a26b1b2..000000000 --- a/src/moc_SdMsgBaseCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SdMsgBaseCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/SdMsgBaseCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SdMsgBaseCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SdMsgBaseCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_SdMsgBaseCanvas[] = { - "SdMsgBaseCanvas\0\0modified()\0" -}; - -void SdMsgBaseCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SdMsgBaseCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SdMsgBaseCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SdMsgBaseCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_SdMsgBaseCanvas, - qt_meta_data_SdMsgBaseCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SdMsgBaseCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SdMsgBaseCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SdMsgBaseCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SdMsgBaseCanvas)) - return static_cast(const_cast< SdMsgBaseCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< SdMsgBaseCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int SdMsgBaseCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SdMsgDialog.cpp b/src/moc_SdMsgDialog.cpp deleted file mode 100644 index 0f632b427..000000000 --- a/src/moc_SdMsgDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SdMsgDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/SdMsgDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SdMsgDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SdMsgDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x09, - 23, 12, 12, 12, 0x09, - 32, 12, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_SdMsgDialog[] = { - "SdMsgDialog\0\0menu_op()\0polish()\0" - "accept()\0" -}; - -void SdMsgDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SdMsgDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->menu_op(); break; - case 1: _t->polish(); break; - case 2: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SdMsgDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SdMsgDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_SdMsgDialog, - qt_meta_data_SdMsgDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SdMsgDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SdMsgDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SdMsgDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SdMsgDialog)) - return static_cast(const_cast< SdMsgDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int SdMsgDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SeqDiagramWindow.cpp b/src/moc_SeqDiagramWindow.cpp deleted file mode 100644 index b37733619..000000000 --- a/src/moc_SeqDiagramWindow.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SeqDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/SeqDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SeqDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SeqDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 18, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - 30, 17, 17, 17, 0x09, - 50, 17, 17, 17, 0x09, - 69, 17, 17, 17, 0x09, - 84, 17, 17, 17, 0x09, - 98, 17, 17, 17, 0x09, - 113, 17, 17, 17, 0x09, - 132, 17, 17, 17, 0x09, - 152, 17, 17, 17, 0x09, - 170, 17, 17, 17, 0x09, - 189, 17, 17, 17, 0x09, - 207, 17, 17, 17, 0x09, - 226, 17, 17, 17, 0x09, - 242, 17, 17, 17, 0x09, - 262, 17, 17, 17, 0x09, - 273, 17, 17, 17, 0x09, - 286, 17, 17, 17, 0x09, - 297, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_SeqDiagramWindow[] = { - "SeqDiagramWindow\0\0hit_class()\0" - "hit_classinstance()\0hit_continuation()\0" - "hit_fragment()\0hit_syncmsg()\0" - "hit_asyncmsg()\0hit_foundsyncmsg()\0" - "hit_foundasyncmsg()\0hit_lostsyncmsg()\0" - "hit_lostasyncmsg()\0hit_syncselfmsg()\0" - "hit_asyncselfmsg()\0hit_returnmsg()\0" - "hit_selfreturnmsg()\0hit_note()\0" - "hit_anchor()\0hit_text()\0hit_image()\0" -}; - -void SeqDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SeqDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_class(); break; - case 1: _t->hit_classinstance(); break; - case 2: _t->hit_continuation(); break; - case 3: _t->hit_fragment(); break; - case 4: _t->hit_syncmsg(); break; - case 5: _t->hit_asyncmsg(); break; - case 6: _t->hit_foundsyncmsg(); break; - case 7: _t->hit_foundasyncmsg(); break; - case 8: _t->hit_lostsyncmsg(); break; - case 9: _t->hit_lostasyncmsg(); break; - case 10: _t->hit_syncselfmsg(); break; - case 11: _t->hit_asyncselfmsg(); break; - case 12: _t->hit_returnmsg(); break; - case 13: _t->hit_selfreturnmsg(); break; - case 14: _t->hit_note(); break; - case 15: _t->hit_anchor(); break; - case 16: _t->hit_text(); break; - case 17: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SeqDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SeqDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_SeqDiagramWindow, - qt_meta_data_SeqDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SeqDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SeqDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SeqDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SeqDiagramWindow)) - return static_cast(const_cast< SeqDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int SeqDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 18) - qt_static_metacall(this, _c, _id, _a); - _id -= 18; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_Settings.cpp b/src/moc_Settings.cpp deleted file mode 100644 index 1fece8d50..000000000 --- a/src/moc_Settings.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'Settings.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "misc/Settings.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'Settings.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_DrawingSettings[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x05, - - 0 // eod -}; - -static const char qt_meta_stringdata_DrawingSettings[] = { - "DrawingSettings\0\0changed()\0" -}; - -void DrawingSettings::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - DrawingSettings *_t = static_cast(_o); - switch (_id) { - case 0: _t->changed(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData DrawingSettings::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject DrawingSettings::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_DrawingSettings, - qt_meta_data_DrawingSettings, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &DrawingSettings::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *DrawingSettings::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *DrawingSettings::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_DrawingSettings)) - return static_cast(const_cast< DrawingSettings*>(this)); - return QObject::qt_metacast(_clname); -} - -int DrawingSettings::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} - -// SIGNAL 0 -void DrawingSettings::changed() -{ - QMetaObject::activate(this, &staticMetaObject, 0, 0); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SettingsDialog.cpp b/src/moc_SettingsDialog.cpp deleted file mode 100644 index 2b3931def..000000000 --- a/src/moc_SettingsDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SettingsDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/SettingsDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SettingsDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SettingsDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 25, 15, 15, 15, 0x09, - 34, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_SettingsDialog[] = { - "SettingsDialog\0\0polish()\0accept()\0" - "apply()\0" -}; - -void SettingsDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SettingsDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->apply(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SettingsDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SettingsDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_SettingsDialog, - qt_meta_data_SettingsDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SettingsDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SettingsDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SettingsDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SettingsDialog)) - return static_cast(const_cast< SettingsDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int SettingsDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ShortcutDialog.cpp b/src/moc_ShortcutDialog.cpp deleted file mode 100644 index 25516a27d..000000000 --- a/src/moc_ShortcutDialog.cpp +++ /dev/null @@ -1,173 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ShortcutDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ShortcutDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ShortcutDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ShortcutDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - 25, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ShortcutDialog[] = { - "ShortcutDialog\0\0polish()\0accept()\0" -}; - -void ShortcutDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ShortcutDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ShortcutDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ShortcutDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ShortcutDialog, - qt_meta_data_ShortcutDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ShortcutDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ShortcutDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ShortcutDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ShortcutDialog)) - return static_cast(const_cast< ShortcutDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ShortcutDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_ShortcutTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 39, 15, 14, 14, 0x09, - 82, 74, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ShortcutTable[] = { - "ShortcutTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0value_changed(int,int)\0" -}; - -void ShortcutTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ShortcutTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ShortcutTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ShortcutTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_ShortcutTable, - qt_meta_data_ShortcutTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ShortcutTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ShortcutTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ShortcutTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ShortcutTable)) - return static_cast(const_cast< ShortcutTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int ShortcutTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleData.cpp b/src/moc_SimpleData.cpp deleted file mode 100644 index 24b2e5c5f..000000000 --- a/src/moc_SimpleData.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SimpleData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/SimpleData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SimpleData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SimpleData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_SimpleData[] = { - "SimpleData\0" -}; - -void SimpleData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SimpleData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SimpleData::staticMetaObject = { - { &BasicData::staticMetaObject, qt_meta_stringdata_SimpleData, - qt_meta_data_SimpleData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SimpleData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SimpleData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SimpleData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SimpleData)) - return static_cast(const_cast< SimpleData*>(this)); - return BasicData::qt_metacast(_clname); -} - -int SimpleData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = BasicData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleRelationCanvas.cpp b/src/moc_SimpleRelationCanvas.cpp deleted file mode 100644 index 8dade07e3..000000000 --- a/src/moc_SimpleRelationCanvas.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SimpleRelationCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/SimpleRelationCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SimpleRelationCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SimpleRelationCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x08, - 33, 21, 21, 21, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_SimpleRelationCanvas[] = { - "SimpleRelationCanvas\0\0modified()\0" - "deleted()\0" -}; - -void SimpleRelationCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SimpleRelationCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SimpleRelationCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SimpleRelationCanvas::staticMetaObject = { - { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_SimpleRelationCanvas, - qt_meta_data_SimpleRelationCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SimpleRelationCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SimpleRelationCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SimpleRelationCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SimpleRelationCanvas)) - return static_cast(const_cast< SimpleRelationCanvas*>(this)); - return ArrowCanvas::qt_metacast(_clname); -} - -int SimpleRelationCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ArrowCanvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleRelationData.cpp b/src/moc_SimpleRelationData.cpp deleted file mode 100644 index b026cc4d5..000000000 --- a/src/moc_SimpleRelationData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SimpleRelationData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/SimpleRelationData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SimpleRelationData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SimpleRelationData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_SimpleRelationData[] = { - "SimpleRelationData\0\0end_deleted()\0" -}; - -void SimpleRelationData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SimpleRelationData *_t = static_cast(_o); - switch (_id) { - case 0: _t->end_deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SimpleRelationData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SimpleRelationData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_SimpleRelationData, - qt_meta_data_SimpleRelationData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SimpleRelationData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SimpleRelationData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SimpleRelationData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SimpleRelationData)) - return static_cast(const_cast< SimpleRelationData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int SimpleRelationData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SimpleRelationDialog.cpp b/src/moc_SimpleRelationDialog.cpp deleted file mode 100644 index 18e47216d..000000000 --- a/src/moc_SimpleRelationDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SimpleRelationDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/SimpleRelationDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SimpleRelationDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SimpleRelationDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x09, - 31, 21, 21, 21, 0x09, - 40, 21, 21, 21, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_SimpleRelationDialog[] = { - "SimpleRelationDialog\0\0polish()\0accept()\0" - "edit_description()\0" -}; - -void SimpleRelationDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SimpleRelationDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SimpleRelationDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SimpleRelationDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_SimpleRelationDialog, - qt_meta_data_SimpleRelationDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SimpleRelationDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SimpleRelationDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SimpleRelationDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SimpleRelationDialog)) - return static_cast(const_cast< SimpleRelationDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int SimpleRelationDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_Socket.cpp b/src/moc_Socket.cpp deleted file mode 100644 index e863c1b5b..000000000 --- a/src/moc_Socket.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'Socket.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "tool/Socket.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'Socket.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_Socket[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 8, 7, 7, 7, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_Socket[] = { - "Socket\0\0data_received()\0" -}; - -void Socket::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - Socket *_t = static_cast(_o); - switch (_id) { - case 0: _t->data_received(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData Socket::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject Socket::staticMetaObject = { - { &Q3SocketDevice::staticMetaObject, qt_meta_stringdata_Socket, - qt_meta_data_Socket, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &Socket::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *Socket::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *Socket::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_Socket)) - return static_cast(const_cast< Socket*>(this)); - return Q3SocketDevice::qt_metacast(_clname); -} - -int Socket::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3SocketDevice::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SourceDialog.cpp b/src/moc_SourceDialog.cpp deleted file mode 100644 index 70aaafede..000000000 --- a/src/moc_SourceDialog.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SourceDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/SourceDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SourceDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_NumberedMultiLineEdit[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 27, 23, 22, 22, 0x05, - - 0 // eod -}; - -static const char qt_meta_stringdata_NumberedMultiLineEdit[] = { - "NumberedMultiLineEdit\0\0l,c\0" - "cursorMoved(int,int)\0" -}; - -void NumberedMultiLineEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - NumberedMultiLineEdit *_t = static_cast(_o); - switch (_id) { - case 0: _t->cursorMoved((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData NumberedMultiLineEdit::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject NumberedMultiLineEdit::staticMetaObject = { - { &MultiLineEdit::staticMetaObject, qt_meta_stringdata_NumberedMultiLineEdit, - qt_meta_data_NumberedMultiLineEdit, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &NumberedMultiLineEdit::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *NumberedMultiLineEdit::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *NumberedMultiLineEdit::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_NumberedMultiLineEdit)) - return static_cast(const_cast< NumberedMultiLineEdit*>(this)); - return MultiLineEdit::qt_metacast(_clname); -} - -int NumberedMultiLineEdit::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MultiLineEdit::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} - -// SIGNAL 0 -void NumberedMultiLineEdit::cursorMoved(int _t1, int _t2) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)), const_cast(reinterpret_cast(&_t2)) }; - QMetaObject::activate(this, &staticMetaObject, 0, _a); -} -static const uint qt_meta_data_SourceDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x09, - 25, 21, 13, 13, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_SourceDialog[] = { - "SourceDialog\0\0edit()\0l,c\0" - "updateCursorPos(int,int)\0" -}; - -void SourceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SourceDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->edit(); break; - case 1: _t->updateCursorPos((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData SourceDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SourceDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_SourceDialog, - qt_meta_data_SourceDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SourceDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SourceDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SourceDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SourceDialog)) - return static_cast(const_cast< SourceDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int SourceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StateActionCanvas.cpp b/src/moc_StateActionCanvas.cpp deleted file mode 100644 index c73e1b169..000000000 --- a/src/moc_StateActionCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StateActionCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/StateActionCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StateActionCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StateActionCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x08, - 30, 18, 18, 18, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_StateActionCanvas[] = { - "StateActionCanvas\0\0modified()\0deleted()\0" -}; - -void StateActionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StateActionCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StateActionCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StateActionCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_StateActionCanvas, - qt_meta_data_StateActionCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StateActionCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StateActionCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StateActionCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StateActionCanvas)) - return static_cast(const_cast< StateActionCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< StateActionCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int StateActionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StateActionDialog.cpp b/src/moc_StateActionDialog.cpp deleted file mode 100644 index 34c2afd21..000000000 --- a/src/moc_StateActionDialog.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StateActionDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/StateActionDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StateActionDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StateActionDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 4, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x09, - 28, 18, 18, 18, 0x09, - 37, 18, 18, 18, 0x09, - 56, 18, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_StateActionDialog[] = { - "StateActionDialog\0\0polish()\0accept()\0" - "edit_description()\0change_tabs(QWidget*)\0" -}; - -void StateActionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StateActionDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData StateActionDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StateActionDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_StateActionDialog, - qt_meta_data_StateActionDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StateActionDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StateActionDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StateActionDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StateActionDialog)) - return static_cast(const_cast< StateActionDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int StateActionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) - qt_static_metacall(this, _c, _id, _a); - _id -= 4; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StateCanvas.cpp b/src/moc_StateCanvas.cpp deleted file mode 100644 index 1b016ea69..000000000 --- a/src/moc_StateCanvas.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StateCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/StateCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StateCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StateCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x08, - 24, 12, 12, 12, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_StateCanvas[] = { - "StateCanvas\0\0modified()\0deleted()\0" -}; - -void StateCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StateCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StateCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StateCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_StateCanvas, - qt_meta_data_StateCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StateCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StateCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StateCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StateCanvas)) - return static_cast(const_cast< StateCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< StateCanvas*>(this)); - if (!strcmp(_clname, "MultipleDependency")) - return static_cast< MultipleDependency*>(const_cast< StateCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int StateCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StateData.cpp b/src/moc_StateData.cpp deleted file mode 100644 index 298e99063..000000000 --- a/src/moc_StateData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StateData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/StateData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StateData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StateData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_StateData[] = { - "StateData\0\0on_delete()\0" -}; - -void StateData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StateData *_t = static_cast(_o); - switch (_id) { - case 0: _t->on_delete(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StateData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StateData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_StateData, - qt_meta_data_StateData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StateData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StateData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StateData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StateData)) - return static_cast(const_cast< StateData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int StateData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StateDiagramView.cpp b/src/moc_StateDiagramView.cpp deleted file mode 100644 index 4838d3bbd..000000000 --- a/src/moc_StateDiagramView.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StateDiagramView.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/StateDiagramView.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StateDiagramView.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StateDiagramView[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_StateDiagramView[] = { - "StateDiagramView\0" -}; - -void StateDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StateDiagramView::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StateDiagramView::staticMetaObject = { - { &DiagramView::staticMetaObject, qt_meta_stringdata_StateDiagramView, - qt_meta_data_StateDiagramView, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StateDiagramView::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StateDiagramView::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StateDiagramView::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StateDiagramView)) - return static_cast(const_cast< StateDiagramView*>(this)); - return DiagramView::qt_metacast(_clname); -} - -int StateDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramView::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StateDiagramWindow.cpp b/src/moc_StateDiagramWindow.cpp deleted file mode 100644 index 10375f18a..000000000 --- a/src/moc_StateDiagramWindow.cpp +++ /dev/null @@ -1,147 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StateDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/StateDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StateDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StateDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 23, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 20, 19, 19, 19, 0x09, - 32, 19, 19, 19, 0x09, - 46, 19, 19, 19, 0x09, - 61, 19, 19, 19, 0x09, - 78, 19, 19, 19, 0x09, - 94, 19, 19, 19, 0x09, - 108, 19, 19, 19, 0x09, - 120, 19, 19, 19, 0x09, - 136, 19, 19, 19, 0x09, - 154, 19, 19, 19, 0x09, - 175, 19, 19, 19, 0x09, - 190, 19, 19, 19, 0x09, - 203, 19, 19, 19, 0x09, - 214, 19, 19, 19, 0x09, - 225, 19, 19, 19, 0x09, - 238, 19, 19, 19, 0x09, - 251, 19, 19, 19, 0x09, - 266, 19, 19, 19, 0x09, - 282, 19, 19, 19, 0x09, - 299, 19, 19, 19, 0x09, - 310, 19, 19, 19, 0x09, - 323, 19, 19, 19, 0x09, - 334, 19, 19, 19, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_StateDiagramWindow[] = { - "StateDiagramWindow\0\0hit_state()\0" - "hit_package()\0hit_fragment()\0" - "hit_entryPoint()\0hit_exitPoint()\0" - "hit_initial()\0hit_final()\0hit_terminate()\0" - "hit_deepHistory()\0hit_shallowHistory()\0" - "hit_junction()\0hit_choice()\0hit_fork()\0" - "hit_join()\0hit_region()\0hit_action()\0" - "hit_signalin()\0hit_signalout()\0" - "hit_transition()\0hit_note()\0hit_anchor()\0" - "hit_text()\0hit_image()\0" -}; - -void StateDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StateDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_state(); break; - case 1: _t->hit_package(); break; - case 2: _t->hit_fragment(); break; - case 3: _t->hit_entryPoint(); break; - case 4: _t->hit_exitPoint(); break; - case 5: _t->hit_initial(); break; - case 6: _t->hit_final(); break; - case 7: _t->hit_terminate(); break; - case 8: _t->hit_deepHistory(); break; - case 9: _t->hit_shallowHistory(); break; - case 10: _t->hit_junction(); break; - case 11: _t->hit_choice(); break; - case 12: _t->hit_fork(); break; - case 13: _t->hit_join(); break; - case 14: _t->hit_region(); break; - case 15: _t->hit_action(); break; - case 16: _t->hit_signalin(); break; - case 17: _t->hit_signalout(); break; - case 18: _t->hit_transition(); break; - case 19: _t->hit_note(); break; - case 20: _t->hit_anchor(); break; - case 21: _t->hit_text(); break; - case 22: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StateDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StateDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_StateDiagramWindow, - qt_meta_data_StateDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StateDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StateDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StateDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StateDiagramWindow)) - return static_cast(const_cast< StateDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int StateDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 23) - qt_static_metacall(this, _c, _id, _a); - _id -= 23; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StateDialog.cpp b/src/moc_StateDialog.cpp deleted file mode 100644 index 7b756dc2b..000000000 --- a/src/moc_StateDialog.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StateDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/StateDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StateDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StateDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 16, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x09, - 22, 12, 12, 12, 0x09, - 31, 12, 12, 12, 0x09, - 52, 12, 12, 12, 0x09, - 69, 12, 12, 12, 0x09, - 88, 12, 12, 12, 0x09, - 105, 12, 12, 12, 0x09, - 121, 12, 12, 12, 0x09, - 141, 12, 12, 12, 0x09, - 158, 12, 12, 12, 0x09, - 174, 12, 12, 12, 0x09, - 194, 12, 12, 12, 0x09, - 212, 12, 12, 12, 0x09, - 229, 12, 12, 12, 0x09, - 250, 12, 12, 12, 0x09, - 272, 12, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_StateDialog[] = { - "StateDialog\0\0polish()\0accept()\0" - "menu_specification()\0menu_reference()\0" - "edit_description()\0edit_uml_entry()\0" - "edit_uml_exit()\0edit_uml_activity()\0" - "edit_cpp_entry()\0edit_cpp_exit()\0" - "edit_cpp_activity()\0edit_java_entry()\0" - "edit_java_exit()\0edit_java_activity()\0" - "change_tabs(QWidget*)\0ed_ref_activated(int)\0" -}; - -void StateDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StateDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->menu_specification(); break; - case 3: _t->menu_reference(); break; - case 4: _t->edit_description(); break; - case 5: _t->edit_uml_entry(); break; - case 6: _t->edit_uml_exit(); break; - case 7: _t->edit_uml_activity(); break; - case 8: _t->edit_cpp_entry(); break; - case 9: _t->edit_cpp_exit(); break; - case 10: _t->edit_cpp_activity(); break; - case 11: _t->edit_java_entry(); break; - case 12: _t->edit_java_exit(); break; - case 13: _t->edit_java_activity(); break; - case 14: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - case 15: _t->ed_ref_activated((*reinterpret_cast< int(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData StateDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StateDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_StateDialog, - qt_meta_data_StateDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StateDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StateDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StateDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StateDialog)) - return static_cast(const_cast< StateDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int StateDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 16) - qt_static_metacall(this, _c, _id, _a); - _id -= 16; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StereotypeDialog.cpp b/src/moc_StereotypeDialog.cpp deleted file mode 100644 index 3302b46ce..000000000 --- a/src/moc_StereotypeDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StereotypeDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/StereotypeDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StereotypeDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StereotypeDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - 27, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_StereotypeDialog[] = { - "StereotypeDialog\0\0polish()\0accept()\0" -}; - -void StereotypeDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StereotypeDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StereotypeDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StereotypeDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_StereotypeDialog, - qt_meta_data_StereotypeDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StereotypeDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StereotypeDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StereotypeDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StereotypeDialog)) - return static_cast(const_cast< StereotypeDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int StereotypeDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StereotypePropertiesCanvas.cpp b/src/moc_StereotypePropertiesCanvas.cpp deleted file mode 100644 index 371bebb13..000000000 --- a/src/moc_StereotypePropertiesCanvas.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StereotypePropertiesCanvas.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/StereotypePropertiesCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StereotypePropertiesCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StereotypePropertiesCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 28, 27, 27, 27, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_StereotypePropertiesCanvas[] = { - "StereotypePropertiesCanvas\0\0update()\0" -}; - -void StereotypePropertiesCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StereotypePropertiesCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->update(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StereotypePropertiesCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StereotypePropertiesCanvas::staticMetaObject = { - { &NoteCanvas::staticMetaObject, qt_meta_stringdata_StereotypePropertiesCanvas, - qt_meta_data_StereotypePropertiesCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StereotypePropertiesCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StereotypePropertiesCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StereotypePropertiesCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StereotypePropertiesCanvas)) - return static_cast(const_cast< StereotypePropertiesCanvas*>(this)); - return NoteCanvas::qt_metacast(_clname); -} - -int StereotypePropertiesCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = NoteCanvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StereotypesDialog.cpp b/src/moc_StereotypesDialog.cpp deleted file mode 100644 index bd568fcb0..000000000 --- a/src/moc_StereotypesDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StereotypesDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/StereotypesDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StereotypesDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StereotypesDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x09, - 28, 18, 18, 18, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_StereotypesDialog[] = { - "StereotypesDialog\0\0polish()\0accept()\0" -}; - -void StereotypesDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StereotypesDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData StereotypesDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StereotypesDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_StereotypesDialog, - qt_meta_data_StereotypesDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StereotypesDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StereotypesDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StereotypesDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StereotypesDialog)) - return static_cast(const_cast< StereotypesDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int StereotypesDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_StringTable.cpp b/src/moc_StringTable.cpp deleted file mode 100644 index 140c95bd9..000000000 --- a/src/moc_StringTable.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'StringTable.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/StringTable.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'StringTable.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_StringTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 37, 13, 12, 12, 0x09, - 80, 72, 12, 12, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_StringTable[] = { - "StringTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" - "row,col\0value_changed(int,int)\0" -}; - -void StringTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - StringTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - case 1: _t->value_changed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData StringTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject StringTable::staticMetaObject = { - { &MyTable::staticMetaObject, qt_meta_stringdata_StringTable, - qt_meta_data_StringTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &StringTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *StringTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *StringTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_StringTable)) - return static_cast(const_cast< StringTable*>(this)); - return MyTable::qt_metacast(_clname); -} - -int StringTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = MyTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_SubjectCanvas.cpp b/src/moc_SubjectCanvas.cpp deleted file mode 100644 index e8e86a626..000000000 --- a/src/moc_SubjectCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'SubjectCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/SubjectCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'SubjectCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_SubjectCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_SubjectCanvas[] = { - "SubjectCanvas\0\0modified()\0" -}; - -void SubjectCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - SubjectCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData SubjectCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject SubjectCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_SubjectCanvas, - qt_meta_data_SubjectCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &SubjectCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *SubjectCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *SubjectCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_SubjectCanvas)) - return static_cast(const_cast< SubjectCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< SubjectCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int SubjectCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ToolCom.cpp b/src/moc_ToolCom.cpp deleted file mode 100644 index 61bcc7218..000000000 --- a/src/moc_ToolCom.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ToolCom.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "tool/ToolCom.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ToolCom.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ToolCom[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 9, 8, 8, 8, 0x05, - - // slots: signature, parameters, type, tag, flags - 18, 8, 8, 8, 0x0a, - 38, 8, 8, 8, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_ToolCom[] = { - "ToolCom\0\0closed()\0connexion_timeout()\0" - "processFinished()\0" -}; - -void ToolCom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ToolCom *_t = static_cast(_o); - switch (_id) { - case 0: _t->closed(); break; - case 1: _t->connexion_timeout(); break; - case 2: _t->processFinished(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ToolCom::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ToolCom::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_ToolCom, - qt_meta_data_ToolCom, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ToolCom::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ToolCom::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ToolCom::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ToolCom)) - return static_cast(const_cast< ToolCom*>(this)); - return QObject::qt_metacast(_clname); -} - -int ToolCom::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} - -// SIGNAL 0 -void ToolCom::closed() -{ - QMetaObject::activate(this, &staticMetaObject, 0, 0); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_ToolDialog.cpp b/src/moc_ToolDialog.cpp deleted file mode 100644 index 2b10737d0..000000000 --- a/src/moc_ToolDialog.cpp +++ /dev/null @@ -1,170 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'ToolDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/ToolDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'ToolDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ToolDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x09, - 21, 11, 11, 11, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ToolDialog[] = { - "ToolDialog\0\0accept()\0polish()\0" -}; - -void ToolDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ToolDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->accept(); break; - case 1: _t->polish(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ToolDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ToolDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_ToolDialog, - qt_meta_data_ToolDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ToolDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ToolDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ToolDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ToolDialog)) - return static_cast(const_cast< ToolDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int ToolDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -static const uint qt_meta_data_ToolTable[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 35, 11, 10, 10, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_ToolTable[] = { - "ToolTable\0\0row,col,button,mousePos\0" - "button_pressed(int,int,int,QPoint)\0" -}; - -void ToolTable::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ToolTable *_t = static_cast(_o); - switch (_id) { - case 0: _t->button_pressed((*reinterpret_cast< int(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2])),(*reinterpret_cast< int(*)>(_a[3])),(*reinterpret_cast< const QPoint(*)>(_a[4]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData ToolTable::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ToolTable::staticMetaObject = { - { &StringTable::staticMetaObject, qt_meta_stringdata_ToolTable, - qt_meta_data_ToolTable, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ToolTable::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ToolTable::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ToolTable::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ToolTable)) - return static_cast(const_cast< ToolTable*>(this)); - return StringTable::qt_metacast(_clname); -} - -int ToolTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = StringTable::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_TraceDialog.cpp b/src/moc_TraceDialog.cpp deleted file mode 100644 index 3a39f8707..000000000 --- a/src/moc_TraceDialog.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'TraceDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/TraceDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'TraceDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_TraceDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x0a, - 19, 12, 12, 12, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_TraceDialog[] = { - "TraceDialog\0\0clr()\0save()\0" -}; - -void TraceDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - TraceDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->clr(); break; - case 1: _t->save(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData TraceDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject TraceDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_TraceDialog, - qt_meta_data_TraceDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &TraceDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *TraceDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *TraceDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_TraceDialog)) - return static_cast(const_cast< TraceDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int TraceDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_TransitionCanvas.cpp b/src/moc_TransitionCanvas.cpp deleted file mode 100644 index 850944f42..000000000 --- a/src/moc_TransitionCanvas.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'TransitionCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/TransitionCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'TransitionCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_TransitionCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x08, - 29, 17, 17, 17, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_TransitionCanvas[] = { - "TransitionCanvas\0\0modified()\0deleted()\0" -}; - -void TransitionCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - TransitionCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData TransitionCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject TransitionCanvas::staticMetaObject = { - { &ArrowCanvas::staticMetaObject, qt_meta_stringdata_TransitionCanvas, - qt_meta_data_TransitionCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &TransitionCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *TransitionCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *TransitionCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_TransitionCanvas)) - return static_cast(const_cast< TransitionCanvas*>(this)); - return ArrowCanvas::qt_metacast(_clname); -} - -int TransitionCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = ArrowCanvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_TransitionData.cpp b/src/moc_TransitionData.cpp deleted file mode 100644 index bfd512831..000000000 --- a/src/moc_TransitionData.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'TransitionData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/TransitionData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'TransitionData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_TransitionData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_TransitionData[] = { - "TransitionData\0\0end_deleted()\0" -}; - -void TransitionData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - TransitionData *_t = static_cast(_o); - switch (_id) { - case 0: _t->end_deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData TransitionData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject TransitionData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_TransitionData, - qt_meta_data_TransitionData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &TransitionData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *TransitionData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *TransitionData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_TransitionData)) - return static_cast(const_cast< TransitionData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int TransitionData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_TransitionDialog.cpp b/src/moc_TransitionDialog.cpp deleted file mode 100644 index 625417ada..000000000 --- a/src/moc_TransitionDialog.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'TransitionDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/TransitionDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'TransitionDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_TransitionDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 13, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 18, 17, 17, 17, 0x09, - 27, 17, 17, 17, 0x09, - 36, 17, 17, 17, 0x09, - 55, 17, 17, 17, 0x09, - 74, 17, 17, 17, 0x09, - 91, 17, 17, 17, 0x09, - 107, 17, 17, 17, 0x09, - 126, 17, 17, 17, 0x09, - 143, 17, 17, 17, 0x09, - 159, 17, 17, 17, 0x09, - 179, 17, 17, 17, 0x09, - 197, 17, 17, 17, 0x09, - 214, 17, 17, 17, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_TransitionDialog[] = { - "TransitionDialog\0\0polish()\0accept()\0" - "edit_description()\0edit_uml_trigger()\0" - "edit_uml_guard()\0edit_uml_expr()\0" - "edit_cpp_trigger()\0edit_cpp_guard()\0" - "edit_cpp_expr()\0edit_java_trigger()\0" - "edit_java_guard()\0edit_java_expr()\0" - "change_tabs(QWidget*)\0" -}; - -void TransitionDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - TransitionDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - case 3: _t->edit_uml_trigger(); break; - case 4: _t->edit_uml_guard(); break; - case 5: _t->edit_uml_expr(); break; - case 6: _t->edit_cpp_trigger(); break; - case 7: _t->edit_cpp_guard(); break; - case 8: _t->edit_cpp_expr(); break; - case 9: _t->edit_java_trigger(); break; - case 10: _t->edit_java_guard(); break; - case 11: _t->edit_java_expr(); break; - case 12: _t->change_tabs((*reinterpret_cast< QWidget*(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData TransitionDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject TransitionDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_TransitionDialog, - qt_meta_data_TransitionDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &TransitionDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *TransitionDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *TransitionDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_TransitionDialog)) - return static_cast(const_cast< TransitionDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int TransitionDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 13) - qt_static_metacall(this, _c, _id, _a); - _id -= 13; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UcClassCanvas.cpp b/src/moc_UcClassCanvas.cpp deleted file mode 100644 index fdb9824c7..000000000 --- a/src/moc_UcClassCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UcClassCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/UcClassCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UcClassCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UcClassCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x08, - 26, 14, 14, 14, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_UcClassCanvas[] = { - "UcClassCanvas\0\0modified()\0deleted()\0" -}; - -void UcClassCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - UcClassCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData UcClassCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UcClassCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_UcClassCanvas, - qt_meta_data_UcClassCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UcClassCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UcClassCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UcClassCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UcClassCanvas)) - return static_cast(const_cast< UcClassCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< UcClassCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int UcClassCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UcUseCaseCanvas.cpp b/src/moc_UcUseCaseCanvas.cpp deleted file mode 100644 index 754f78f2d..000000000 --- a/src/moc_UcUseCaseCanvas.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UcUseCaseCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/UcUseCaseCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UcUseCaseCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UcUseCaseCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x08, - 28, 16, 16, 16, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_UcUseCaseCanvas[] = { - "UcUseCaseCanvas\0\0modified()\0deleted()\0" -}; - -void UcUseCaseCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - UcUseCaseCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->modified(); break; - case 1: _t->deleted(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData UcUseCaseCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UcUseCaseCanvas::staticMetaObject = { - { &QObject::staticMetaObject, qt_meta_stringdata_UcUseCaseCanvas, - qt_meta_data_UcUseCaseCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UcUseCaseCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UcUseCaseCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UcUseCaseCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UcUseCaseCanvas)) - return static_cast(const_cast< UcUseCaseCanvas*>(this)); - if (!strcmp(_clname, "DiagramCanvas")) - return static_cast< DiagramCanvas*>(const_cast< UcUseCaseCanvas*>(this)); - return QObject::qt_metacast(_clname); -} - -int UcUseCaseCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QObject::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 2) - qt_static_metacall(this, _c, _id, _a); - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UmlCanvas.cpp b/src/moc_UmlCanvas.cpp deleted file mode 100644 index bbd595407..000000000 --- a/src/moc_UmlCanvas.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UmlCanvas.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/UmlCanvas.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UmlCanvas.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UmlCanvas[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_UmlCanvas[] = { - "UmlCanvas\0\0update()\0" -}; - -void UmlCanvas::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - UmlCanvas *_t = static_cast(_o); - switch (_id) { - case 0: _t->update(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData UmlCanvas::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UmlCanvas::staticMetaObject = { - { &Q3Canvas::staticMetaObject, qt_meta_stringdata_UmlCanvas, - qt_meta_data_UmlCanvas, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UmlCanvas::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UmlCanvas::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UmlCanvas::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UmlCanvas)) - return static_cast(const_cast< UmlCanvas*>(this)); - return Q3Canvas::qt_metacast(_clname); -} - -int UmlCanvas::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3Canvas::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UmlWindow.cpp b/src/moc_UmlWindow.cpp deleted file mode 100644 index 21eb039cc..000000000 --- a/src/moc_UmlWindow.cpp +++ /dev/null @@ -1,295 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UmlWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/UmlWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UmlWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UmlWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 81, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x08, - 24, 10, 10, 10, 0x08, - 42, 10, 10, 10, 0x08, - 49, 10, 10, 10, 0x08, - 56, 10, 10, 10, 0x08, - 65, 10, 10, 10, 0x08, - 73, 10, 10, 10, 0x08, - 81, 10, 10, 10, 0x08, - 88, 10, 10, 10, 0x08, - 105, 10, 10, 10, 0x08, - 119, 10, 10, 10, 0x08, - 133, 10, 10, 10, 0x08, - 153, 10, 10, 10, 0x08, - 172, 10, 10, 10, 0x08, - 194, 10, 10, 10, 0x08, - 218, 10, 10, 10, 0x08, - 228, 10, 10, 10, 0x08, - 239, 10, 10, 10, 0x08, - 249, 10, 10, 10, 0x08, - 262, 10, 10, 10, 0x08, - 277, 10, 272, 10, 0x08, - 289, 10, 272, 10, 0x08, - 302, 10, 272, 10, 0x08, - 314, 10, 272, 10, 0x08, - 329, 10, 272, 10, 0x08, - 341, 10, 10, 10, 0x08, - 351, 10, 10, 10, 0x08, - 362, 10, 10, 10, 0x08, - 384, 10, 10, 10, 0x08, - 401, 10, 10, 10, 0x08, - 412, 10, 10, 10, 0x08, - 434, 10, 10, 10, 0x08, - 448, 10, 10, 10, 0x08, - 466, 10, 10, 10, 0x08, - 482, 10, 10, 10, 0x08, - 501, 10, 10, 10, 0x08, - 517, 10, 10, 10, 0x08, - 525, 10, 10, 10, 0x08, - 535, 10, 10, 10, 0x08, - 542, 10, 10, 10, 0x08, - 555, 10, 10, 10, 0x08, - 570, 10, 10, 10, 0x08, - 586, 10, 10, 10, 0x08, - 601, 10, 10, 10, 0x08, - 619, 10, 10, 10, 0x08, - 634, 10, 10, 10, 0x08, - 649, 10, 10, 10, 0x08, - 663, 10, 10, 10, 0x08, - 679, 10, 10, 10, 0x08, - 694, 10, 10, 10, 0x08, - 711, 10, 10, 10, 0x08, - 725, 10, 10, 10, 0x08, - 742, 10, 10, 10, 0x08, - 762, 10, 10, 10, 0x08, - 783, 10, 10, 10, 0x08, - 803, 10, 10, 10, 0x08, - 832, 826, 10, 10, 0x08, - 846, 10, 10, 10, 0x08, - 862, 10, 10, 10, 0x08, - 885, 10, 10, 10, 0x08, - 904, 10, 10, 10, 0x08, - 922, 10, 10, 10, 0x08, - 943, 10, 10, 10, 0x08, - 963, 10, 10, 10, 0x08, - 985, 10, 10, 10, 0x08, - 1013, 1010, 10, 10, 0x08, - 1036, 10, 10, 10, 0x08, - 1058, 10, 10, 10, 0x08, - 1080, 10, 10, 10, 0x08, - 1106, 10, 10, 10, 0x08, - 1123, 10, 10, 10, 0x08, - 1147, 10, 10, 10, 0x08, - 1162, 10, 10, 10, 0x08, - 1187, 1010, 10, 10, 0x08, - 1213, 1010, 10, 10, 0x08, - 1241, 1239, 10, 10, 0x08, - 1267, 10, 10, 10, 0x0a, - 1282, 1280, 10, 10, 0x0a, - 1336, 1331, 10, 10, 0x0a, - 1375, 10, 10, 10, 0x0a, - 1393, 10, 10, 10, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_UmlWindow[] = { - "UmlWindow\0\0newProject()\0newFromTemplate()\0" - "load()\0save()\0saveAs()\0print()\0close()\0" - "quit()\0browser_search()\0next_select()\0" - "prev_select()\0edit_gen_settings()\0" - "edit_stereotypes()\0edit_class_settings()\0" - "edit_drawing_settings()\0use_cpp()\0" - "use_java()\0use_php()\0use_python()\0" - "use_idl()\0bool\0using_cpp()\0using_java()\0" - "using_php()\0using_python()\0using_idl()\0" - "verbose()\0preserve()\0addoperationprofile()\0" - "edit_shortcuts()\0edit_env()\0" - "edit_image_root_dir()\0motif_style()\0" - "motifplus_style()\0windows_style()\0" - "show_stereotypes()\0do_completion()\0" - "about()\0aboutQt()\0help()\0show_trace()\0" - "cpp_generate()\0java_generate()\0" - "php_generate()\0python_generate()\0" - "idl_generate()\0java_catalog()\0" - "cpp_reverse()\0cpp_roundtrip()\0" - "java_reverse()\0java_roundtrip()\0" - "php_reverse()\0python_reverse()\0" - "cpp_roundtripbody()\0java_roundtripbody()\0" - "php_roundtripbody()\0python_roundtripbody()\0" - "param\0run_tool(int)\0tool_settings()\0" - "import_tool_settings()\0plug_out_upgrade()\0" - "comment_changed()\0preferred_geometry()\0" - "close_all_windows()\0toolMenuAboutToShow()\0" - "projectMenuAboutToShow()\0id\0" - "historicActivated(int)\0langMenuAboutToShow()\0" - "miscMenuAboutToShow()\0fontSizeMenuAboutToShow()\0" - "setFontSize(int)\0formatMenuAboutToShow()\0" - "setFormat(int)\0windowsMenuAboutToShow()\0" - "windowsMenuActivated(int)\0" - "dialogsMenuActivated(int)\0e\0" - "keyPressEvent(QKeyEvent*)\0whats_this()\0" - ",\0OnPickSelectionFromItem(QModelIndex,QModelIndex)\0" - "item\0OnChooseQuickEditMode(Q3ListViewItem*)\0" - "OnShowQuickEdit()\0OnCallClipboardMenu()\0" -}; - -void UmlWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - UmlWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->newProject(); break; - case 1: _t->newFromTemplate(); break; - case 2: _t->load(); break; - case 3: _t->save(); break; - case 4: _t->saveAs(); break; - case 5: _t->print(); break; - case 6: _t->close(); break; - case 7: _t->quit(); break; - case 8: _t->browser_search(); break; - case 9: _t->next_select(); break; - case 10: _t->prev_select(); break; - case 11: _t->edit_gen_settings(); break; - case 12: _t->edit_stereotypes(); break; - case 13: _t->edit_class_settings(); break; - case 14: _t->edit_drawing_settings(); break; - case 15: _t->use_cpp(); break; - case 16: _t->use_java(); break; - case 17: _t->use_php(); break; - case 18: _t->use_python(); break; - case 19: _t->use_idl(); break; - case 20: { bool _r = _t->using_cpp(); - if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; - case 21: { bool _r = _t->using_java(); - if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; - case 22: { bool _r = _t->using_php(); - if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; - case 23: { bool _r = _t->using_python(); - if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; - case 24: { bool _r = _t->using_idl(); - if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; } break; - case 25: _t->verbose(); break; - case 26: _t->preserve(); break; - case 27: _t->addoperationprofile(); break; - case 28: _t->edit_shortcuts(); break; - case 29: _t->edit_env(); break; - case 30: _t->edit_image_root_dir(); break; - case 31: _t->motif_style(); break; - case 32: _t->motifplus_style(); break; - case 33: _t->windows_style(); break; - case 34: _t->show_stereotypes(); break; - case 35: _t->do_completion(); break; - case 36: _t->about(); break; - case 37: _t->aboutQt(); break; - case 38: _t->help(); break; - case 39: _t->show_trace(); break; - case 40: _t->cpp_generate(); break; - case 41: _t->java_generate(); break; - case 42: _t->php_generate(); break; - case 43: _t->python_generate(); break; - case 44: _t->idl_generate(); break; - case 45: _t->java_catalog(); break; - case 46: _t->cpp_reverse(); break; - case 47: _t->cpp_roundtrip(); break; - case 48: _t->java_reverse(); break; - case 49: _t->java_roundtrip(); break; - case 50: _t->php_reverse(); break; - case 51: _t->python_reverse(); break; - case 52: _t->cpp_roundtripbody(); break; - case 53: _t->java_roundtripbody(); break; - case 54: _t->php_roundtripbody(); break; - case 55: _t->python_roundtripbody(); break; - case 56: _t->run_tool((*reinterpret_cast< int(*)>(_a[1]))); break; - case 57: _t->tool_settings(); break; - case 58: _t->import_tool_settings(); break; - case 59: _t->plug_out_upgrade(); break; - case 60: _t->comment_changed(); break; - case 61: _t->preferred_geometry(); break; - case 62: _t->close_all_windows(); break; - case 63: _t->toolMenuAboutToShow(); break; - case 64: _t->projectMenuAboutToShow(); break; - case 65: _t->historicActivated((*reinterpret_cast< int(*)>(_a[1]))); break; - case 66: _t->langMenuAboutToShow(); break; - case 67: _t->miscMenuAboutToShow(); break; - case 68: _t->fontSizeMenuAboutToShow(); break; - case 69: _t->setFontSize((*reinterpret_cast< int(*)>(_a[1]))); break; - case 70: _t->formatMenuAboutToShow(); break; - case 71: _t->setFormat((*reinterpret_cast< int(*)>(_a[1]))); break; - case 72: _t->windowsMenuAboutToShow(); break; - case 73: _t->windowsMenuActivated((*reinterpret_cast< int(*)>(_a[1]))); break; - case 74: _t->dialogsMenuActivated((*reinterpret_cast< int(*)>(_a[1]))); break; - case 75: _t->keyPressEvent((*reinterpret_cast< QKeyEvent*(*)>(_a[1]))); break; - case 76: _t->whats_this(); break; - case 77: _t->OnPickSelectionFromItem((*reinterpret_cast< const QModelIndex(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2]))); break; - case 78: _t->OnChooseQuickEditMode((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; - case 79: _t->OnShowQuickEdit(); break; - case 80: _t->OnCallClipboardMenu(); break; - default: ; - } - } -} - -const QMetaObjectExtraData UmlWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UmlWindow::staticMetaObject = { - { &QMainWindow::staticMetaObject, qt_meta_stringdata_UmlWindow, - qt_meta_data_UmlWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UmlWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UmlWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UmlWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UmlWindow)) - return static_cast(const_cast< UmlWindow*>(this)); - return QMainWindow::qt_metacast(_clname); -} - -int UmlWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QMainWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 81) - qt_static_metacall(this, _c, _id, _a); - _id -= 81; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseData.cpp b/src/moc_UseCaseData.cpp deleted file mode 100644 index dc297a0eb..000000000 --- a/src/moc_UseCaseData.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UseCaseData.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "data/UseCaseData.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UseCaseData.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UseCaseData[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_UseCaseData[] = { - "UseCaseData\0" -}; - -void UseCaseData::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData UseCaseData::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UseCaseData::staticMetaObject = { - { &SimpleData::staticMetaObject, qt_meta_stringdata_UseCaseData, - qt_meta_data_UseCaseData, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UseCaseData::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UseCaseData::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UseCaseData::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UseCaseData)) - return static_cast(const_cast< UseCaseData*>(this)); - return SimpleData::qt_metacast(_clname); -} - -int UseCaseData::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = SimpleData::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseDiagramView.cpp b/src/moc_UseCaseDiagramView.cpp deleted file mode 100644 index 4a5250781..000000000 --- a/src/moc_UseCaseDiagramView.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UseCaseDiagramView.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/UseCaseDiagramView.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UseCaseDiagramView.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UseCaseDiagramView[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_UseCaseDiagramView[] = { - "UseCaseDiagramView\0" -}; - -void UseCaseDiagramView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData UseCaseDiagramView::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UseCaseDiagramView::staticMetaObject = { - { &DiagramView::staticMetaObject, qt_meta_stringdata_UseCaseDiagramView, - qt_meta_data_UseCaseDiagramView, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UseCaseDiagramView::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UseCaseDiagramView::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UseCaseDiagramView::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UseCaseDiagramView)) - return static_cast(const_cast< UseCaseDiagramView*>(this)); - return DiagramView::qt_metacast(_clname); -} - -int UseCaseDiagramView::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramView::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseDiagramWindow.cpp b/src/moc_UseCaseDiagramWindow.cpp deleted file mode 100644 index 74cf9d292..000000000 --- a/src/moc_UseCaseDiagramWindow.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UseCaseDiagramWindow.h' -** -** Created: Fri May 24 23:48:40 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "diagram/UseCaseDiagramWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UseCaseDiagramWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UseCaseDiagramWindow[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 13, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 22, 21, 21, 21, 0x09, - 34, 21, 21, 21, 0x09, - 48, 21, 21, 21, 0x09, - 62, 21, 21, 21, 0x09, - 77, 21, 21, 21, 0x09, - 91, 21, 21, 21, 0x09, - 109, 21, 21, 21, 0x09, - 138, 21, 21, 21, 0x09, - 155, 21, 21, 21, 0x09, - 169, 21, 21, 21, 0x09, - 180, 21, 21, 21, 0x09, - 193, 21, 21, 21, 0x09, - 204, 21, 21, 21, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_UseCaseDiagramWindow[] = { - "UseCaseDiagramWindow\0\0hit_class()\0" - "hit_usecase()\0hit_package()\0hit_fragment()\0" - "hit_subject()\0hit_association()\0" - "hit_directionalassociation()\0" - "hit_dependency()\0hit_inherit()\0" - "hit_note()\0hit_anchor()\0hit_text()\0" - "hit_image()\0" -}; - -void UseCaseDiagramWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - UseCaseDiagramWindow *_t = static_cast(_o); - switch (_id) { - case 0: _t->hit_class(); break; - case 1: _t->hit_usecase(); break; - case 2: _t->hit_package(); break; - case 3: _t->hit_fragment(); break; - case 4: _t->hit_subject(); break; - case 5: _t->hit_association(); break; - case 6: _t->hit_directionalassociation(); break; - case 7: _t->hit_dependency(); break; - case 8: _t->hit_inherit(); break; - case 9: _t->hit_note(); break; - case 10: _t->hit_anchor(); break; - case 11: _t->hit_text(); break; - case 12: _t->hit_image(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData UseCaseDiagramWindow::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UseCaseDiagramWindow::staticMetaObject = { - { &DiagramWindow::staticMetaObject, qt_meta_stringdata_UseCaseDiagramWindow, - qt_meta_data_UseCaseDiagramWindow, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UseCaseDiagramWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UseCaseDiagramWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UseCaseDiagramWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UseCaseDiagramWindow)) - return static_cast(const_cast< UseCaseDiagramWindow*>(this)); - return DiagramWindow::qt_metacast(_clname); -} - -int UseCaseDiagramWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = DiagramWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 13) - qt_static_metacall(this, _c, _id, _a); - _id -= 13; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_UseCaseDialog.cpp b/src/moc_UseCaseDialog.cpp deleted file mode 100644 index 24d54eac3..000000000 --- a/src/moc_UseCaseDialog.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'UseCaseDialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/UseCaseDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'UseCaseDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_UseCaseDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x09, - 24, 14, 14, 14, 0x09, - 33, 14, 14, 14, 0x09, - - 0 // eod -}; - -static const char qt_meta_stringdata_UseCaseDialog[] = { - "UseCaseDialog\0\0polish()\0accept()\0" - "edit_description()\0" -}; - -void UseCaseDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - UseCaseDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->polish(); break; - case 1: _t->accept(); break; - case 2: _t->edit_description(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData UseCaseDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject UseCaseDialog::staticMetaObject = { - { &Q3TabDialog::staticMetaObject, qt_meta_stringdata_UseCaseDialog, - qt_meta_data_UseCaseDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &UseCaseDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *UseCaseDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *UseCaseDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_UseCaseDialog)) - return static_cast(const_cast< UseCaseDialog*>(this)); - return Q3TabDialog::qt_metacast(_clname); -} - -int UseCaseDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = Q3TabDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 3) - qt_static_metacall(this, _c, _id, _a); - _id -= 3; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_catalogwidget.cpp b/src/moc_catalogwidget.cpp deleted file mode 100644 index b89a6d448..000000000 --- a/src/moc_catalogwidget.cpp +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'catalogwidget.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "ui/catalogwidget.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'catalogwidget.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CatalogWidget[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 14, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 2, // signalCount - - // signals: signature, parameters, type, tag, flags - 17, 15, 14, 14, 0x05, - 43, 14, 14, 14, 0x05, - - // slots: signature, parameters, type, tag, flags - 61, 14, 14, 14, 0x0a, - 96, 14, 14, 14, 0x0a, - 123, 14, 14, 14, 0x0a, - 159, 154, 14, 14, 0x0a, - 196, 14, 14, 14, 0x0a, - 236, 14, 14, 14, 0x0a, - 261, 15, 14, 14, 0x0a, - 306, 14, 14, 14, 0x0a, - 342, 14, 14, 14, 0x0a, - 374, 14, 14, 14, 0x0a, - 403, 14, 14, 14, 0x0a, - 441, 435, 14, 14, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_CatalogWidget[] = { - "CatalogWidget\0\0,\0markedRemove(QString,int)\0" - "allMarkedRemove()\0OnPerformVisitedFiltering(QString)\0" - "OnPerformMarkedFiltering()\0" - "OnPerformFavouritesFiltering()\0item\0" - "OnUpdateVisitedView(Q3ListViewItem*)\0" - "OnUpdateMarkedView(QList)\0" - "OnUpdateFavoutitesView()\0" - "OnSelectedInVisited(QModelIndex,QModelIndex)\0" - "OnRemoveCurrentItemFromFavourites()\0" - "OnRemoveCurrentItemFromMarked()\0" - "OnRemoveAllItemsFromMarked()\0" - "OnFavouritesContextMenu(QPoint)\0point\0" - "OnMarkedContextMenu(QPoint)\0" -}; - -void CatalogWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - CatalogWidget *_t = static_cast(_o); - switch (_id) { - case 0: _t->markedRemove((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< int(*)>(_a[2]))); break; - case 1: _t->allMarkedRemove(); break; - case 2: _t->OnPerformVisitedFiltering((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 3: _t->OnPerformMarkedFiltering(); break; - case 4: _t->OnPerformFavouritesFiltering(); break; - case 5: _t->OnUpdateVisitedView((*reinterpret_cast< Q3ListViewItem*(*)>(_a[1]))); break; - case 6: _t->OnUpdateMarkedView((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 7: _t->OnUpdateFavoutitesView(); break; - case 8: _t->OnSelectedInVisited((*reinterpret_cast< const QModelIndex(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2]))); break; - case 9: _t->OnRemoveCurrentItemFromFavourites(); break; - case 10: _t->OnRemoveCurrentItemFromMarked(); break; - case 11: _t->OnRemoveAllItemsFromMarked(); break; - case 12: _t->OnFavouritesContextMenu((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 13: _t->OnMarkedContextMenu((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData CatalogWidget::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject CatalogWidget::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_CatalogWidget, - qt_meta_data_CatalogWidget, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CatalogWidget::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CatalogWidget::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CatalogWidget::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CatalogWidget)) - return static_cast(const_cast< CatalogWidget*>(this)); - return QWidget::qt_metacast(_clname); -} - -int CatalogWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QWidget::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 14) - qt_static_metacall(this, _c, _id, _a); - _id -= 14; - } - return _id; -} - -// SIGNAL 0 -void CatalogWidget::markedRemove(QString _t1, int _t2) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)), const_cast(reinterpret_cast(&_t2)) }; - QMetaObject::activate(this, &staticMetaObject, 0, _a); -} - -// SIGNAL 1 -void CatalogWidget::allMarkedRemove() -{ - QMetaObject::activate(this, &staticMetaObject, 1, 0); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_constructorinitializerdialog.cpp b/src/moc_constructorinitializerdialog.cpp deleted file mode 100644 index 7fa704fb0..000000000 --- a/src/moc_constructorinitializerdialog.cpp +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'constructorinitializerdialog.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "ui/constructorinitializerdialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'constructorinitializerdialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_ConstructorInitializerDialog[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 30, 29, 29, 29, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_ConstructorInitializerDialog[] = { - "ConstructorInitializerDialog\0\0" - "OnInitializerChanged()\0" -}; - -void ConstructorInitializerDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - ConstructorInitializerDialog *_t = static_cast(_o); - switch (_id) { - case 0: _t->OnInitializerChanged(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData ConstructorInitializerDialog::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject ConstructorInitializerDialog::staticMetaObject = { - { &EdgeMenuDialogQt4::staticMetaObject, qt_meta_stringdata_ConstructorInitializerDialog, - qt_meta_data_ConstructorInitializerDialog, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &ConstructorInitializerDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *ConstructorInitializerDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *ConstructorInitializerDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_ConstructorInitializerDialog)) - return static_cast(const_cast< ConstructorInitializerDialog*>(this)); - return EdgeMenuDialogQt4::qt_metacast(_clname); -} - -int ConstructorInitializerDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = EdgeMenuDialogQt4::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_edgemenudialogqt4.cpp b/src/moc_edgemenudialogqt4.cpp deleted file mode 100644 index f1c55a380..000000000 --- a/src/moc_edgemenudialogqt4.cpp +++ /dev/null @@ -1,144 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'edgemenudialogqt4.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "dialog/edgemenudialogqt4.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'edgemenudialogqt4.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_EdgeMenuDialogQt4[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 9, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 4, // signalCount - - // signals: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x05, - 43, 18, 18, 18, 0x05, - 55, 18, 18, 18, 0x05, - 70, 18, 18, 18, 0x05, - - // slots: signature, parameters, type, tag, flags - 93, 18, 18, 18, 0x0a, - 113, 18, 18, 18, 0x0a, - 137, 18, 18, 18, 0x0a, - 160, 18, 18, 18, 0x0a, - 185, 18, 18, 18, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_EdgeMenuDialogQt4[] = { - "EdgeMenuDialogQt4\0\0edgeMenuRequested(uint)\0" - "lostFocus()\0hideEdgeMenu()\0" - "repositionMenu(QPoint)\0OnPickNextSibling()\0" - "OnPickPreviousSibling()\0OnInitiateMove(QPoint)\0" - "OnInitiateResize(QPoint)\0" - "OnNewCoordinatesReceived(QPoint)\0" -}; - -void EdgeMenuDialogQt4::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - EdgeMenuDialogQt4 *_t = static_cast(_o); - switch (_id) { - case 0: _t->edgeMenuRequested((*reinterpret_cast< uint(*)>(_a[1]))); break; - case 1: _t->lostFocus(); break; - case 2: _t->hideEdgeMenu(); break; - case 3: _t->repositionMenu((*reinterpret_cast< const QPoint(*)>(_a[1]))); break; - case 4: _t->OnPickNextSibling(); break; - case 5: _t->OnPickPreviousSibling(); break; - case 6: _t->OnInitiateMove((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 7: _t->OnInitiateResize((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 8: _t->OnNewCoordinatesReceived((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - default: ; - } - } -} - -const QMetaObjectExtraData EdgeMenuDialogQt4::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject EdgeMenuDialogQt4::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_EdgeMenuDialogQt4, - qt_meta_data_EdgeMenuDialogQt4, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &EdgeMenuDialogQt4::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *EdgeMenuDialogQt4::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *EdgeMenuDialogQt4::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_EdgeMenuDialogQt4)) - return static_cast(const_cast< EdgeMenuDialogQt4*>(this)); - if (!strcmp(_clname, "EdgeMenuDialogBase")) - return static_cast< EdgeMenuDialogBase*>(const_cast< EdgeMenuDialogQt4*>(this)); - return QDialog::qt_metacast(_clname); -} - -int EdgeMenuDialogQt4::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 9) - qt_static_metacall(this, _c, _id, _a); - _id -= 9; - } - return _id; -} - -// SIGNAL 0 -void EdgeMenuDialogQt4::edgeMenuRequested(uint _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 0, _a); -} - -// SIGNAL 1 -void EdgeMenuDialogQt4::lostFocus() -{ - QMetaObject::activate(this, &staticMetaObject, 1, 0); -} - -// SIGNAL 2 -void EdgeMenuDialogQt4::hideEdgeMenu() -{ - QMetaObject::activate(this, &staticMetaObject, 2, 0); -} - -// SIGNAL 3 -void EdgeMenuDialogQt4::repositionMenu(const QPoint & _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 3, _a); -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_operationwidgetcpp.cpp b/src/moc_operationwidgetcpp.cpp deleted file mode 100644 index 6b59a5876..000000000 --- a/src/moc_operationwidgetcpp.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'operationwidgetcpp.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "ui/operationwidgetcpp.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'operationwidgetcpp.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_OperationWidgetCpp[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - 0 // eod -}; - -static const char qt_meta_stringdata_OperationWidgetCpp[] = { - "OperationWidgetCpp\0" -}; - -void OperationWidgetCpp::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - Q_UNUSED(_o); - Q_UNUSED(_id); - Q_UNUSED(_c); - Q_UNUSED(_a); -} - -const QMetaObjectExtraData OperationWidgetCpp::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject OperationWidgetCpp::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_OperationWidgetCpp, - qt_meta_data_OperationWidgetCpp, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &OperationWidgetCpp::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *OperationWidgetCpp::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *OperationWidgetCpp::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_OperationWidgetCpp)) - return static_cast(const_cast< OperationWidgetCpp*>(this)); - return QWidget::qt_metacast(_clname); -} - -int OperationWidgetCpp::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QWidget::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - return _id; -} -QT_END_MOC_NAMESPACE diff --git a/src/moc_quickedit.cpp b/src/moc_quickedit.cpp deleted file mode 100644 index 387d17db1..000000000 --- a/src/moc_quickedit.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'quickedit.h' -** -** Created: Fri May 24 23:48:41 2013 -** by: The Qt Meta Object Compiler version 63 (Qt 4.8.3) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "CustomWidgets/quickedit.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'quickedit.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.3. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_QuickEdit[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 14, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x0a, - 33, 10, 10, 10, 0x0a, - 42, 10, 10, 10, 0x0a, - 59, 10, 10, 10, 0x0a, - 76, 10, 10, 10, 0x0a, - 93, 10, 10, 10, 0x0a, - 121, 10, 10, 10, 0x0a, - 144, 10, 10, 10, 0x0a, - 167, 10, 10, 10, 0x0a, - 194, 10, 10, 10, 0x0a, - 214, 10, 10, 10, 0x0a, - 235, 10, 10, 10, 0x0a, - 252, 10, 10, 10, 0x0a, - 275, 10, 10, 10, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_QuickEdit[] = { - "QuickEdit\0\0OnContextMenu(QPoint)\0" - "OnShow()\0OnAddParameter()\0OnAddOperation()\0" - "OnAddAttribute()\0OnPerformFiltering(QString)\0" - "OnDecreaseOpenLevels()\0OnIncreaseOpenLevels()\0" - "OnChangeColumnVisibility()\0" - "OnMoveMarkedAfter()\0OnMoveMarkedBefore()\0" - "OnRefreshTable()\0OnCollapseExpandSelf()\0" - "OnCollapseExpandParent()\0" -}; - -void QuickEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - QuickEdit *_t = static_cast(_o); - switch (_id) { - case 0: _t->OnContextMenu((*reinterpret_cast< QPoint(*)>(_a[1]))); break; - case 1: _t->OnShow(); break; - case 2: _t->OnAddParameter(); break; - case 3: _t->OnAddOperation(); break; - case 4: _t->OnAddAttribute(); break; - case 5: _t->OnPerformFiltering((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 6: _t->OnDecreaseOpenLevels(); break; - case 7: _t->OnIncreaseOpenLevels(); break; - case 8: _t->OnChangeColumnVisibility(); break; - case 9: _t->OnMoveMarkedAfter(); break; - case 10: _t->OnMoveMarkedBefore(); break; - case 11: _t->OnRefreshTable(); break; - case 12: _t->OnCollapseExpandSelf(); break; - case 13: _t->OnCollapseExpandParent(); break; - default: ; - } - } -} - -const QMetaObjectExtraData QuickEdit::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject QuickEdit::staticMetaObject = { - { &QWidget::staticMetaObject, qt_meta_stringdata_QuickEdit, - qt_meta_data_QuickEdit, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &QuickEdit::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *QuickEdit::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *QuickEdit::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_QuickEdit)) - return static_cast(const_cast< QuickEdit*>(this)); - return QWidget::qt_metacast(_clname); -} - -int QuickEdit::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QWidget::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 14) - qt_static_metacall(this, _c, _id, _a); - _id -= 14; - } - return _id; -} -QT_END_MOC_NAMESPACE From c98b6c626a6ca8b9e56b9df8b6f543b9e7d8c843 Mon Sep 17 00:00:00 2001 From: Zeks Date: Sat, 22 Jun 2013 22:00:54 +0400 Subject: [PATCH 111/297] this should fix roundtrip for non-compatible projects --- src/CppReverse/UmlOperation.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp index 898c3c49e..0987efc75 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -2114,11 +2114,21 @@ 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 = From 9ac55d9ed6fa6a1c47eaf34e8509484155709487 Mon Sep 17 00:00:00 2001 From: Zeks Date: Sat, 22 Jun 2013 22:08:42 +0400 Subject: [PATCH 112/297] and for python too --- src/CppGenerator/UmlOperation.cpp | 4 +-- src/RoundtripBody/UmlOperation.cpp | 44 ++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/CppGenerator/UmlOperation.cpp b/src/CppGenerator/UmlOperation.cpp index 5704dd5f3..feba16528 100644 --- a/src/CppGenerator/UmlOperation.cpp +++ b/src/CppGenerator/UmlOperation.cpp @@ -51,8 +51,8 @@ // to manage preserved bodies, the key is the id under bouml QHash 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; diff --git a/src/RoundtripBody/UmlOperation.cpp b/src/RoundtripBody/UmlOperation.cpp index 28ecaa8ab..88d74a57d 100644 --- a/src/RoundtripBody/UmlOperation.cpp +++ b/src/RoundtripBody/UmlOperation.cpp @@ -28,6 +28,8 @@ #include #include #include +#include +#include #include #include //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; @@ -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) { From c5a636889e9002dd99db2f544de1f8db326ae9f4 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 22 Jun 2013 22:53:18 +0400 Subject: [PATCH 113/297] minor code change. shuld have no effect --- src/CppReverse/UmlOperation.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp index 898c3c49e..91654f88d 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -1432,12 +1432,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; } From 6900e445e0e22b2495d8d66fd5411937077ce142 Mon Sep 17 00:00:00 2001 From: zeks Date: Sat, 22 Jun 2013 22:55:02 +0400 Subject: [PATCH 114/297] fixing to integrate possble other prefix --- src/CppReverse/UmlOperation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp index 370d40105..1703e9549 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -2144,7 +2144,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')) From 334bc0890122e06dc0c9d8bc16731dd7343d8379 Mon Sep 17 00:00:00 2001 From: pasgui Date: Sun, 23 Jun 2013 11:35:23 +0200 Subject: [PATCH 115/297] Add deploy and usecasewizard to the Makefile --- Makefile | 8 ++++-- genplugouts/usecasewizard/usecasewizard.pro | 30 ++++++++++++--------- src/CppReverse/UmlOperation.cpp | 2 +- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 75ae27cad..a2e24e46a 100644 --- a/Makefile +++ b/Makefile @@ -61,9 +61,11 @@ SRC_DIRS=\ PLUGOUT_DIRS=genplugouts/BrowserSort \ genplugouts/CppUtilities \ + genplugouts/deploy \ genplugouts/FileControl \ genplugouts/GlobalChange \ genplugouts/HtmlDoc \ + genplugouts/usecasewizard \ genplugouts/Xmi2Generator \ genplugouts/xmi2import @@ -73,10 +75,13 @@ PROGS=douml \ cpp_reverse \ cpp_roundtrip \ cpp_util \ + deplcl \ file_control \ ghtml \ global_change \ + gxmi2 \ idl_generator \ + ixmi2 \ java_catalog \ java_generator \ java_reverse \ @@ -85,8 +90,7 @@ PROGS=douml \ php_reverse \ python_generator \ roundtrip_body \ - gxmi2 \ - ixmi2 + usecasewizard compile: ( cd src/Libs/L_UniversalModels ; $(QMAKE) -config ${config} L_UniversalModels.pro; ) || exit 1 ; $(MAKE) -C src/Libs/L_UniversalModels || exit 1 diff --git a/genplugouts/usecasewizard/usecasewizard.pro b/genplugouts/usecasewizard/usecasewizard.pro index ca37c3361..c25118024 100644 --- a/genplugouts/usecasewizard/usecasewizard.pro +++ b/genplugouts/usecasewizard/usecasewizard.pro @@ -1,6 +1,15 @@ TEMPLATE = app TARGET = usecasewizard -CONFIG += warn_on qt +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 = " " +} HEADERS = ./UmlFinalState.h \ ./UmlBaseCollaborationDiagram.h \ ./UmlBaseClassView.h \ @@ -231,19 +240,16 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib -Release{ - - - MOC_DIR = bin/douml/use_case/MOC_release - OBJECTS_DIR = bin/douml/use_case/Obj_release +DESTDIR = ../../bin +Release { + 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 - +Debug { + MOC_DIR = $${DESTDIR}/moc_debug/$${TARGET} + OBJECTS_DIR = $${DESTDIR}/obj_debug/$${TARGET} } - UI_DIR = src/ui - DESTDIR = ../../bin +UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp index 1703e9549..a46c1c1ce 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -38,7 +38,7 @@ using namespace std; #endif #include - +#include #include "UmlOperation.h" #include "Package.h" #include "UmlClass.h" From 24617a27afe42b4503d05ebb6c9a461bca8f278f Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 23 Jun 2013 20:22:32 +0400 Subject: [PATCH 116/297] this makes cppreverse treat any marker in between class and classname as export marker that is ignored --- src/CppReverse/Class.cpp | 337 ++++++++++++++++++-------------- src/CppReverse/Class.h | 15 +- src/CppReverse/Package.cpp | 18 +- src/CppReverse/UmlOperation.cpp | 24 ++- 4 files changed, 231 insertions(+), 163 deletions(-) diff --git a/src/CppReverse/Class.cpp b/src/CppReverse/Class.cpp index af6c64882..8d710e102 100644 --- a/src/CppReverse/Class.cpp +++ b/src/CppReverse/Class.cpp @@ -45,6 +45,7 @@ using namespace std; #include "UmlOperation.h" #include "UmlAttribute.h" #include "CppSettings.h" +#include #include "UmlExtraClassMember.h" #include "Lex.h" #include "UmlCom.h" @@ -92,7 +93,7 @@ Class::~Class() Class * Class::reverse(ClassContainer * container, WrapperStr stereotype, const Q3ValueList & tmplts, - const WrapperStr & path, WrapperStr name + const WrapperStr & path, WrapperStr name,WrapperStr ignoredToken #ifdef ROUNDTRIP , bool rndtrp, QList & expectedorder #endif @@ -115,6 +116,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; @@ -343,8 +350,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 +481,8 @@ Class * Class::reverse(ClassContainer * container, WrapperStr stereotype, continue; } - else { + else + { cl->manage_member(s, visibility, container, path #ifdef ROUNDTRIP , roundtrip, expected_order @@ -609,6 +619,80 @@ void Class::declaration(const WrapperStr & name, const WrapperStr & stereotype, } } + +ESwitchKeyword Class::manage_operation(WrapperStr& s,WrapperStr& type, WrapperStr& name, + const Q3ValueList & 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) +{ + // 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).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}")) + 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 @@ -647,149 +731,96 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, #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> hashBased; + std::function 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 basicProcessor = [&](bool& toProcess) + { + toProcess = TRUE; + Lex::mark(); + return ESwitchKeyword::k_none; + }; + std::function typeProcessor = [&]() + { + type = (type.isEmpty()) ? s : type + " " + s; + return ESwitchKeyword::k_none; + }; + std::function operationProcessor = [&]() + { + return manage_operation(s, type, name, tmplts, modifier, pretype, + inlinep,virtualp,staticp,constp,volatilep,explicitp,friendp,typenamep, + visibility, + friend_template,comment,description); + }; + std::function 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); - - break; - } - } - else if (s == "(") { - // suppose an operation - if (Package::scanning()) - break; - - if (type.isEmpty()) { - if (!Package::scanning()) - Lex::error_near("("); + 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, staticp)); + hashBased.insert("virtual", std::bind(basicProcessor, virtualp)); + hashBased.insert("inline", std::bind(basicProcessor, inlinep)); + hashBased.insert("explicit", std::bind(basicProcessor, explicitp)); + hashBased.insert("const", std::bind(modifierProcessor, constp)); + hashBased.insert("mutable", std::bind(modifierProcessor, mutablep)); + //volatile seemed to have unaccessible second else if in the original. need to cehck + hashBased.insert("volatile", std::bind(modifierProcessor, volatilep)); + hashBased.insert("typename", std::bind(modifierProcessor, 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)) + { + ESwitchKeyword retVal; + retVal = hashBased.contains(control) ? hashBased[control]() : hashBased[s](); + control = ""; + if(retVal == ESwitchKeyword::k_none) + s = Lex::read_word(); + 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 +831,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, value = "= " + Lex::region(); } - else if (s == ";") { + else if (s == ";") + { if (Package::scanning()) return; @@ -836,7 +868,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, return; } - else if (s == "friend") { + else if (s == "friend") + { s = Lex::read_word(); if (s == "QMAC_PASCAL") @@ -928,7 +961,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,7 +1002,7 @@ 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 #endif @@ -988,7 +1022,7 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, else if ((s2 = Lex::read_word()) == ";") { // form like 'struct X;' Lex::come_back(); - reverse(this, s, tmplts, path, 0 + reverse(this, s, tmplts, path, 0, "" #ifdef ROUNDTRIP , roundtrip, expected_order #endif @@ -1010,7 +1044,7 @@ 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 #endif @@ -1019,7 +1053,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, return; } } - else if (s == "class") { + else if (s == "class") + { Lex::mark(); WrapperStr s2 = Lex::read_word(); @@ -1042,7 +1077,7 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, } else { Lex::come_back(); - reverse(this, s, tmplts, path, 0 + reverse(this, s, tmplts, path, 0, "" #ifdef ROUNDTRIP , roundtrip, expected_order #endif @@ -1050,7 +1085,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, return; } } - else if (s == "typedef") { + else if (s == "typedef") + { reverse_typedef(this, path, tmplts #ifdef ROUNDTRIP , roundtrip, expected_order @@ -1058,7 +1094,8 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, ); return; } - else if (s == "template") { + else if (s == "template") + { FormalParameterList tmplt; tmplts.append(tmplt); @@ -1549,7 +1586,7 @@ Class * Class::reverse_enum(ClassContainer * container, )) == 0) return FALSE; } - else if ((cl = Class::reverse(container, s, tmplts, path, name1 + else if ((cl = Class::reverse(container, s, tmplts, path, name1, "" #ifdef ROUNDTRIP , rndtrp, expectedorder #endif diff --git a/src/CppReverse/Class.h b/src/CppReverse/Class.h index 6c01f9b13..1fa6c9af7 100644 --- a/src/CppReverse/Class.h +++ b/src/CppReverse/Class.h @@ -38,6 +38,14 @@ #include #include +enum class ESwitchKeyword +{ + k_none, + k_continue, + k_return, + k_break +}; + class Class : public BrowserNode, public ClassContainer { protected: @@ -59,6 +67,11 @@ class Class : public BrowserNode, public ClassContainer NDict declared; NDict defined; + ESwitchKeyword manage_operation(WrapperStr& s,WrapperStr& type, WrapperStr& name, + const Q3ValueList &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); void manage_member(WrapperStr s, aVisibility visibility, ClassContainer * container, const WrapperStr & path #ifdef ROUNDTRIP @@ -135,7 +148,7 @@ class Class : public BrowserNode, public ClassContainer static Class * reverse(ClassContainer * container, WrapperStr stereotype, const Q3ValueList & tmplt, - const WrapperStr & path, WrapperStr name + const WrapperStr & path, WrapperStr name, WrapperStr ignoredToken #ifdef ROUNDTRIP , bool rndtrp, QList & expectedorder #endif diff --git a/src/CppReverse/Package.cpp b/src/CppReverse/Package.cpp index ae468d748..074c121bb 100644 --- a/src/CppReverse/Package.cpp +++ b/src/CppReverse/Package.cpp @@ -898,14 +898,26 @@ 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"; + Class::reverse(this, s, Formals, f, 0, possibleExportToken); + } + else if (Lex::identifierp(s2, TRUE) && ((s2 = Lex::read_word()) != "{") && (s2 != ":") && (s2 != ";")) { // form like 'class X Y' pretype = s; @@ -917,9 +929,9 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block) #ifdef ROUNDTRIP QList dummy; - Class::reverse(this, s, Formals, f, 0, FALSE, dummy); + Class::reverse(this, s, Formals, f, 0, Lex::read_word(), FALSE, dummy); #else - Class::reverse(this, s, Formals, f, 0); + Class::reverse(this, s, Formals, f, 0, ""); #endif } } diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp index 1703e9549..69b1eb130 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -237,8 +237,7 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name, WrapperStr cl_name = WrapperStr((cl->text(0)).toAscii().constData()); UmlOperation * op; #ifdef ROUNDTRIP - bool may_roundtrip = roundtrip && - (!cl->from_libp() || (visibility != PrivateVisibility)); + bool may_roundtrip = roundtrip && (!cl->from_libp() || (visibility != PrivateVisibility)); Q3ValueList params; WrapperStr body; @@ -271,7 +270,8 @@ 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}"; @@ -284,7 +284,8 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name, int index = 0; WrapperStr decl; - if (op != 0) { + if (op != 0) + { op->set_Visibility(visibility); if (staticp) op->set_isClassMember(staticp); @@ -375,15 +376,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(); @@ -420,7 +424,8 @@ bool UmlOperation::new_one(Class * cl, const WrapperStr & name, cl->set_updated(); } } - else { + else + { // operation doesn't yet exist op = UmlBaseOperation::create(cl->get_uml(), name); @@ -1486,7 +1491,8 @@ 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(" " + Lex::quote(name) + " is lost"); UmlOperation::skip_body(); return; From 7a0509f7a2cb95df201041278cd7622b44612849 Mon Sep 17 00:00:00 2001 From: zeks Date: Sun, 23 Jun 2013 22:06:31 +0400 Subject: [PATCH 117/297] fixes roundtrip --- src/CppReverse/Class.cpp | 44 +++++++++++++++++++-------------- src/CppReverse/Class.h | 9 +++++-- src/CppReverse/Package.cpp | 10 +++++++- src/CppReverse/UmlOperation.cpp | 1 + src/Tools/UmlBaseOperation.h | 20 +++++++-------- 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/CppReverse/Class.cpp b/src/CppReverse/Class.cpp index 8d710e102..2ea07938b 100644 --- a/src/CppReverse/Class.cpp +++ b/src/CppReverse/Class.cpp @@ -93,11 +93,11 @@ Class::~Class() Class * Class::reverse(ClassContainer * container, WrapperStr stereotype, const Q3ValueList & tmplts, - const WrapperStr & path, WrapperStr name,WrapperStr ignoredToken + const WrapperStr & path, WrapperStr name #ifdef ROUNDTRIP , bool rndtrp, QList & expectedorder #endif - ) + ,WrapperStr ignoredToken) { bool from_typedef = !name.isEmpty(); WrapperStr comment = Lex::get_comments(); @@ -620,11 +620,15 @@ void Class::declaration(const WrapperStr & name, const WrapperStr & stereotype, } -ESwitchKeyword Class::manage_operation(WrapperStr& s,WrapperStr& type, WrapperStr& name, +ESwitchKeyword Class::manage_operation(WrapperStr& s, WrapperStr& type, WrapperStr& name, const Q3ValueList & 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) + 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 expected_order + #endif + ) { // suppose an operation if (Package::scanning()) @@ -758,7 +762,11 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, return manage_operation(s, type, name, tmplts, modifier, pretype, inlinep,virtualp,staticp,constp,volatilep,explicitp,friendp,typenamep, visibility, - friend_template,comment,description); + friend_template,comment,description +#ifdef ROUNDTRIP + ,roundtrip, expected_order +#endif + ); }; std::function starProcessor = [&]() { @@ -1002,11 +1010,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; } @@ -1022,11 +1030,11 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, else if ((s2 = Lex::read_word()) == ";") { // form like 'struct X;' Lex::come_back(); - reverse(this, s, tmplts, path, 0, "" + reverse(this, s, tmplts, path, 0 #ifdef ROUNDTRIP , roundtrip, expected_order #endif - ); + , ""); return; } else if ((s2 != "{") && (s2 != ":")) { @@ -1044,11 +1052,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 #endif - ); + , ""); return; } @@ -1077,11 +1085,11 @@ void Class::manage_member(WrapperStr s, aVisibility visibility, } else { Lex::come_back(); - reverse(this, s, tmplts, path, 0, "" + reverse(this, s, tmplts, path, 0 #ifdef ROUNDTRIP , roundtrip, expected_order #endif - ); + , ""); return; } } @@ -1586,11 +1594,11 @@ Class * Class::reverse_enum(ClassContainer * container, )) == 0) return FALSE; } - else if ((cl = Class::reverse(container, s, tmplts, path, name1, "" + else if ((cl = Class::reverse(container, s, tmplts, path, name1 #ifdef ROUNDTRIP , rndtrp, expectedorder #endif - )) == 0) + , "")) == 0) return FALSE; // here '}' is the last item read diff --git a/src/CppReverse/Class.h b/src/CppReverse/Class.h index 1fa6c9af7..e9fcc5b7b 100644 --- a/src/CppReverse/Class.h +++ b/src/CppReverse/Class.h @@ -71,7 +71,11 @@ class Class : public BrowserNode, public ClassContainer const Q3ValueList &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); + WrapperStr& friend_template, WrapperStr& comment, WrapperStr& description +#ifdef ROUNDTRIP + , bool roundtrip, QList expected_order +#endif + ); void manage_member(WrapperStr s, aVisibility visibility, ClassContainer * container, const WrapperStr & path #ifdef ROUNDTRIP @@ -148,10 +152,11 @@ class Class : public BrowserNode, public ClassContainer static Class * reverse(ClassContainer * container, WrapperStr stereotype, const Q3ValueList & tmplt, - const WrapperStr & path, WrapperStr name, WrapperStr ignoredToken + const WrapperStr & path, WrapperStr name #ifdef ROUNDTRIP , bool rndtrp, QList & expectedorder #endif + , WrapperStr ignoredToken ); static Class * reverse_enum(ClassContainer * container, const WrapperStr & path, WrapperStr name diff --git a/src/CppReverse/Package.cpp b/src/CppReverse/Package.cpp index 074c121bb..dc6dd76fb 100644 --- a/src/CppReverse/Package.cpp +++ b/src/CppReverse/Package.cpp @@ -915,7 +915,15 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block) { //s2 = Lex::read_word(); QLOG_INFO() << "Using export mode"; + +#ifdef ROUNDTRIP + QList 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 != ";")) { @@ -929,7 +937,7 @@ void Package::reverse_toplevel_forms(WrapperStr f, bool sub_block) #ifdef ROUNDTRIP QList dummy; - Class::reverse(this, s, Formals, f, 0, Lex::read_word(), FALSE, dummy); + Class::reverse(this, s, Formals, f, 0, FALSE, dummy, ""); #else Class::reverse(this, s, Formals, f, 0, ""); #endif diff --git a/src/CppReverse/UmlOperation.cpp b/src/CppReverse/UmlOperation.cpp index 69b1eb130..b2a648f64 100644 --- a/src/CppReverse/UmlOperation.cpp +++ b/src/CppReverse/UmlOperation.cpp @@ -48,6 +48,7 @@ using namespace std; #include "UmlCom.h" #include "CppSettings.h" #include "Lex.h" +#include #ifdef REVERSE #include "Statistic.h" # ifdef ROUNDTRIP diff --git a/src/Tools/UmlBaseOperation.h b/src/Tools/UmlBaseOperation.h index c376dd8f0..504ec2554 100644 --- a/src/Tools/UmlBaseOperation.h +++ b/src/Tools/UmlBaseOperation.h @@ -440,26 +440,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 From 0811b37ed6037b05ea0933849d0fff5687df7e1b Mon Sep 17 00:00:00 2001 From: Zeks Date: Mon, 24 Jun 2013 00:13:36 +0400 Subject: [PATCH 118/297] fixes plugin startup on linux --- src/CppGenerator/CppGenerator.pro | 2 +- src/tool/ToolCom.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/CppGenerator/CppGenerator.pro b/src/CppGenerator/CppGenerator.pro index b0440b4eb..bd978e15d 100644 --- a/src/CppGenerator/CppGenerator.pro +++ b/src/CppGenerator/CppGenerator.pro @@ -107,7 +107,7 @@ SOURCES = UmlClassItem.cpp CppRefType.cpp UmlAttribute.cpp \ TARGET = cpp_generator -DEFINES = WITHCPP BooL=bool TRACE +DEFINES = WITHCPP BooL=bool TRACE DEBUG INCLUDEPATH = ../Tools ../CppGenerator ../ diff --git a/src/tool/ToolCom.cpp b/src/tool/ToolCom.cpp index be770c4a7..0562002db 100644 --- a/src/tool/ToolCom.cpp +++ b/src/tool/ToolCom.cpp @@ -40,6 +40,8 @@ using namespace std; #endif #include #include +#include +#include #include #include "ToolCom.h" #include "Socket.h" @@ -189,7 +191,7 @@ int ToolCom::run(const char * cmd, BrowserNode * bn, unsigned port = com->bind(1024); - + qDebug() << QDir::currentPath(); QStringList commandList = QString(cmd).split(" "); QString command = commandList.at(0); commandList.removeAt(0); @@ -200,7 +202,13 @@ int ToolCom::run(const char * cmd, BrowserNode * bn, QStringList arguments; arguments.append(commandList << QString::number(port)); com->exitStaged = exit; +#ifdef Q_OS_UNIX + com->externalProcess->start("./" + command, arguments); +#endif +#ifdef Q_OS_WIN com->externalProcess->start(command, arguments); +#endif + qDebug() << "error was:" << com->externalProcess->error(); com->start = TRUE; return com->id; From 1dbf6f805e8e73ab587d020a8d1ab259b4821111 Mon Sep 17 00:00:00 2001 From: Guilherme Brondani Torri Date: Wed, 10 Jul 2013 16:48:50 +0200 Subject: [PATCH 119/297] add CXXFLAGS for clang++ on OSX Some C++11 features are only available on recent Apple compilers (OSX 10.7+) --- genplugouts/BrowserSort/BrowserSort.pro | 1 + genplugouts/CppUtilities/CppUtilities.pro | 1 + genplugouts/FileControl/FileControl.pro | 1 + genplugouts/GlobalChange/GlobalChange.pro | 1 + genplugouts/HtmlDoc/HtmlDoc.pro | 1 + genplugouts/Xmi2Generator/Xmi2Generator.pro | 2 ++ genplugouts/deploy/deploy.pro | 1 + genplugouts/gpro/gpro.pro | 1 + genplugouts/import_rose/rose.pro | 1 + genplugouts/singleton/singleton.pro | 1 + genplugouts/sm/SmGenerator.pro | 1 + genplugouts/uml_projection/uml_projection.pro | 1 + genplugouts/usecasewizard/usecasewizard.pro | 1 + genplugouts/xmi/xmi.pro | 1 + genplugouts/xmi2import/xmi2import.pro | 1 + src/CppGenerator/CppGenerator.pro | 1 + src/CppReverse/CppReverse.pro | 1 + src/CppRoundtrip/CppRoundtrip.pro | 1 + src/IdlGenerator/IdlGenerator.pro | 1 + src/JavaCat/JavaCat.pro | 1 + src/JavaGenerator/JavaGenerator.pro | 1 + src/JavaReverse/JavaReverse.pro | 1 + src/JavaRoundtrip/JavaRoundtrip.pro | 1 + src/Libs/L_UniversalModels/L_UniversalModels.pro | 1 + src/PhpGenerator/PhpGenerator.pro | 1 + src/PhpReverse/PhpReverse.pro | 1 + src/PlugOutUpgrade/plug_out_upgrade.pro | 1 + src/PythonGenerator/PythonGenerator.pro | 1 + src/RoundtripBody/RoundtripBody.pro | 1 + src/douml.pro | 1 + 30 files changed, 31 insertions(+) diff --git a/genplugouts/BrowserSort/BrowserSort.pro b/genplugouts/BrowserSort/BrowserSort.pro index fc6b96828..ce4441a89 100644 --- a/genplugouts/BrowserSort/BrowserSort.pro +++ b/genplugouts/BrowserSort/BrowserSort.pro @@ -331,6 +331,7 @@ SOURCES = ./UmlActivityPin.cpp \ #The following line was inserted by qt3to4 QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/browsersort diff --git a/genplugouts/CppUtilities/CppUtilities.pro b/genplugouts/CppUtilities/CppUtilities.pro index cd105cdf3..83b23281c 100644 --- a/genplugouts/CppUtilities/CppUtilities.pro +++ b/genplugouts/CppUtilities/CppUtilities.pro @@ -433,3 +433,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/FileControl/FileControl.pro b/genplugouts/FileControl/FileControl.pro index a6137ec3c..ed9a19ea6 100644 --- a/genplugouts/FileControl/FileControl.pro +++ b/genplugouts/FileControl/FileControl.pro @@ -254,3 +254,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/GlobalChange/GlobalChange.pro b/genplugouts/GlobalChange/GlobalChange.pro index 3b7f3b548..e34bb7eae 100644 --- a/genplugouts/GlobalChange/GlobalChange.pro +++ b/genplugouts/GlobalChange/GlobalChange.pro @@ -426,3 +426,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/HtmlDoc/HtmlDoc.pro b/genplugouts/HtmlDoc/HtmlDoc.pro index b5131e6e4..6ab11a17f 100644 --- a/genplugouts/HtmlDoc/HtmlDoc.pro +++ b/genplugouts/HtmlDoc/HtmlDoc.pro @@ -431,3 +431,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/Xmi2Generator/Xmi2Generator.pro b/genplugouts/Xmi2Generator/Xmi2Generator.pro index 02b5f786e..e908af5ee 100644 --- a/genplugouts/Xmi2Generator/Xmi2Generator.pro +++ b/genplugouts/Xmi2Generator/Xmi2Generator.pro @@ -13,6 +13,7 @@ CONFIG(Release, Debug|Release) { CONFIG += precompile_header DEFINES = WITHCPP WITHJAVA WITHIDL WITHPYTHON WITHPHP QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ PRECOMPILED_HEADER += ../../src/misc/mystr.h HEADERS = ./UmlBaseClassDiagram.h \ ./UmlBaseDeepHistoryPseudoState.h \ @@ -431,6 +432,7 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ UI_DIR = src/ui DESTDIR = ../../bin diff --git a/genplugouts/deploy/deploy.pro b/genplugouts/deploy/deploy.pro index 951761162..5c63c04f5 100644 --- a/genplugouts/deploy/deploy.pro +++ b/genplugouts/deploy/deploy.pro @@ -429,3 +429,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/gpro/gpro.pro b/genplugouts/gpro/gpro.pro index 9f8285187..eaa9dd268 100644 --- a/genplugouts/gpro/gpro.pro +++ b/genplugouts/gpro/gpro.pro @@ -183,3 +183,4 @@ Debug{ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/import_rose/rose.pro b/genplugouts/import_rose/rose.pro index 9dc93544f..e492509b9 100644 --- a/genplugouts/import_rose/rose.pro +++ b/genplugouts/import_rose/rose.pro @@ -180,3 +180,4 @@ Debug{ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/singleton/singleton.pro b/genplugouts/singleton/singleton.pro index 6ed42a496..30887e783 100644 --- a/genplugouts/singleton/singleton.pro +++ b/genplugouts/singleton/singleton.pro @@ -172,3 +172,4 @@ Debug{ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/sm/SmGenerator.pro b/genplugouts/sm/SmGenerator.pro index f1ef5dac4..f298013d9 100644 --- a/genplugouts/sm/SmGenerator.pro +++ b/genplugouts/sm/SmGenerator.pro @@ -363,3 +363,4 @@ Debug{ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/uml_projection/uml_projection.pro b/genplugouts/uml_projection/uml_projection.pro index 9973d8ee2..811d200d3 100644 --- a/genplugouts/uml_projection/uml_projection.pro +++ b/genplugouts/uml_projection/uml_projection.pro @@ -419,3 +419,4 @@ Debug{ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/usecasewizard/usecasewizard.pro b/genplugouts/usecasewizard/usecasewizard.pro index ca37c3361..7311a1932 100644 --- a/genplugouts/usecasewizard/usecasewizard.pro +++ b/genplugouts/usecasewizard/usecasewizard.pro @@ -247,3 +247,4 @@ Debug{ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/xmi/xmi.pro b/genplugouts/xmi/xmi.pro index 077739d60..e1b8bd55e 100644 --- a/genplugouts/xmi/xmi.pro +++ b/genplugouts/xmi/xmi.pro @@ -254,3 +254,4 @@ Debug{ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/genplugouts/xmi2import/xmi2import.pro b/genplugouts/xmi2import/xmi2import.pro index ba1e490a8..7d6cce492 100644 --- a/genplugouts/xmi2import/xmi2import.pro +++ b/genplugouts/xmi2import/xmi2import.pro @@ -434,6 +434,7 @@ QT += network qt3support INCLUDEPATH += ../../src CONFIG += qtestlib QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ UI_DIR = src/ui DESTDIR = ../../bin diff --git a/src/CppGenerator/CppGenerator.pro b/src/CppGenerator/CppGenerator.pro index bd978e15d..2f64d6b14 100644 --- a/src/CppGenerator/CppGenerator.pro +++ b/src/CppGenerator/CppGenerator.pro @@ -114,6 +114,7 @@ INCLUDEPATH = ../Tools ../CppGenerator ../ #The following line was inserted by qt3to4 QT += network qt3support testlib QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/cpp_generator diff --git a/src/CppReverse/CppReverse.pro b/src/CppReverse/CppReverse.pro index bbf6bfa4e..794145305 100644 --- a/src/CppReverse/CppReverse.pro +++ b/src/CppReverse/CppReverse.pro @@ -129,6 +129,7 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ HEADERS += \ ../Logging/QsLogDest.h \ diff --git a/src/CppRoundtrip/CppRoundtrip.pro b/src/CppRoundtrip/CppRoundtrip.pro index bf5268984..c94e86387 100644 --- a/src/CppRoundtrip/CppRoundtrip.pro +++ b/src/CppRoundtrip/CppRoundtrip.pro @@ -180,3 +180,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/src/IdlGenerator/IdlGenerator.pro b/src/IdlGenerator/IdlGenerator.pro index 1563da6ca..7e28afd07 100644 --- a/src/IdlGenerator/IdlGenerator.pro +++ b/src/IdlGenerator/IdlGenerator.pro @@ -113,6 +113,7 @@ DESTDIR = ../../bin QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/idl_generator diff --git a/src/JavaCat/JavaCat.pro b/src/JavaCat/JavaCat.pro index 9aa423cde..a5a032383 100644 --- a/src/JavaCat/JavaCat.pro +++ b/src/JavaCat/JavaCat.pro @@ -131,3 +131,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/src/JavaGenerator/JavaGenerator.pro b/src/JavaGenerator/JavaGenerator.pro index 3ae853976..f08ffa852 100644 --- a/src/JavaGenerator/JavaGenerator.pro +++ b/src/JavaGenerator/JavaGenerator.pro @@ -113,6 +113,7 @@ DESTDIR = ../../bin QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/java_generator diff --git a/src/JavaReverse/JavaReverse.pro b/src/JavaReverse/JavaReverse.pro index f6657e742..a51db2a10 100644 --- a/src/JavaReverse/JavaReverse.pro +++ b/src/JavaReverse/JavaReverse.pro @@ -118,6 +118,7 @@ INCLUDEPATH = ../Tools ../JavaReverse ../JavaCat ../ QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/java_reverse diff --git a/src/JavaRoundtrip/JavaRoundtrip.pro b/src/JavaRoundtrip/JavaRoundtrip.pro index cd27409c3..2e5dc4d09 100644 --- a/src/JavaRoundtrip/JavaRoundtrip.pro +++ b/src/JavaRoundtrip/JavaRoundtrip.pro @@ -119,6 +119,7 @@ QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/java_roundtrip diff --git a/src/Libs/L_UniversalModels/L_UniversalModels.pro b/src/Libs/L_UniversalModels/L_UniversalModels.pro index 60aecb344..0f2362f5d 100644 --- a/src/Libs/L_UniversalModels/L_UniversalModels.pro +++ b/src/Libs/L_UniversalModels/L_UniversalModels.pro @@ -18,6 +18,7 @@ INCLUDEPATH += include \ ../L_UniversalModels QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DEFINES += L_TREE_CONTROLLER_LIBRARY diff --git a/src/PhpGenerator/PhpGenerator.pro b/src/PhpGenerator/PhpGenerator.pro index 00648411d..4345a920d 100644 --- a/src/PhpGenerator/PhpGenerator.pro +++ b/src/PhpGenerator/PhpGenerator.pro @@ -109,6 +109,7 @@ INCLUDEPATH = ../Tools ../PhpGenerator ../ QT += network qt3support QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/php_generator diff --git a/src/PhpReverse/PhpReverse.pro b/src/PhpReverse/PhpReverse.pro index ed029f1ee..721a06a7d 100644 --- a/src/PhpReverse/PhpReverse.pro +++ b/src/PhpReverse/PhpReverse.pro @@ -131,3 +131,4 @@ Debug { } UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/src/PlugOutUpgrade/plug_out_upgrade.pro b/src/PlugOutUpgrade/plug_out_upgrade.pro index 0111465ca..10ea25d82 100644 --- a/src/PlugOutUpgrade/plug_out_upgrade.pro +++ b/src/PlugOutUpgrade/plug_out_upgrade.pro @@ -127,3 +127,4 @@ CONFIG(declarative_debug){ DESTDIR = ../../bin QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/src/PythonGenerator/PythonGenerator.pro b/src/PythonGenerator/PythonGenerator.pro index 36c130868..3a4e102fc 100644 --- a/src/PythonGenerator/PythonGenerator.pro +++ b/src/PythonGenerator/PythonGenerator.pro @@ -124,3 +124,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/src/RoundtripBody/RoundtripBody.pro b/src/RoundtripBody/RoundtripBody.pro index 968b0fd7e..2adaaa2d7 100644 --- a/src/RoundtripBody/RoundtripBody.pro +++ b/src/RoundtripBody/RoundtripBody.pro @@ -125,3 +125,4 @@ Debug { UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ diff --git a/src/douml.pro b/src/douml.pro index aec3e1027..77a191389 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -547,6 +547,7 @@ Debug { } QMAKE_CXXFLAGS += -std=gnu++11 +mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ LIBS += -L../bin -lUniversalModels RESOURCES += icons.qrc ../douml.qrc From 8260985d181febad9e2ce6ef1a9d5e987146c706 Mon Sep 17 00:00:00 2001 From: Guilherme Brondani Torri Date: Wed, 10 Jul 2013 17:22:00 +0200 Subject: [PATCH 120/297] fix ini of QList and QStringList --- src/CustomWidgets/quickedit.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index f54d20a48..b91839d8a 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -568,8 +568,8 @@ void QuickEdit::Init(UmlWindow* window, BrowserView* view) originalView = view; mainWindow = window; nullController = QSharedPointer > (new ItemController()); - validTypes = {UmlAggregation,UmlAggregationByValue,UmlDirectionalAggregation, UmlClass, - UmlDirectionalAggregationByValue, UmlAttribute, UmlOperation, UmlExtraMember, UmlClassView, UmlPackage}; + 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" @@ -932,7 +932,8 @@ void QuickEdit::VisibilityDelegateSetup() GenericDelegate* visibilityDelegate = new GenericDelegate(ui->tvEditor, false); visibilityDelegate->widgetCreator = [&](QWidget * parent) { - QStringList visibilities = {"public" , "protected", "private", "package", "default"}; + QStringList visibilities; + visibilities << "public" << "protected" << "private" << "package" << "default"; QComboBox* box = new QComboBox(parent); QStringListModel* model = new QStringListModel; model->setStringList(visibilities); @@ -1070,7 +1071,8 @@ void QuickEdit::DirectionDelegateSetup() GenericDelegate* delegate = new GenericDelegate(ui->tvEditor, false); delegate->widgetCreator = [&](QWidget * parent) { - QStringList visibilities = {"inout" , "in", "out"}; + QStringList visibilities; + visibilities << "inout" << "in" << "out"; QComboBox* box = new QComboBox(parent); QStringListModel* model = new QStringListModel; model->setStringList(visibilities); From 3bc08dd97606eb7bb4e44d69c2b2b5271dde9224 Mon Sep 17 00:00:00 2001 From: Guilherme Brondani Torri Date: Thu, 11 Jul 2013 09:37:50 +0200 Subject: [PATCH 121/297] replace std::initializer_list by QVector clang doens't seem to linke the way it was. --- .../quickeditcontrollersetup.cpp | 122 +++++++++--------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/src/CustomWidgets/quickeditcontrollersetup.cpp b/src/CustomWidgets/quickeditcontrollersetup.cpp index 43fc72ea9..365a2e219 100644 --- a/src/CustomWidgets/quickeditcontrollersetup.cpp +++ b/src/CustomWidgets/quickeditcontrollersetup.cpp @@ -211,21 +211,21 @@ void QuickEdit::SetupClassController() { classController = QSharedPointer >( new ItemController()); classController->SetColumns(columns); - ADD_GETSET(BrowserClass, classController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserClass, classController, columns.indexOf("name"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET(BrowserClass, classController, columns.indexOf("stereotype"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserClass, classController, columns.indexOf("stereotype"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserClass, classController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserClass, classController, columns.indexOf("deleted"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); - ADD_GETSET_CONVERTED(BrowserClass, classController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_CONVERTED(BrowserClass, classController, columns.indexOf("visibility"), QVector({Qt::DisplayRole,Qt::EditRole}), toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_uml_visibility); - ADD_GETSET(BrowserClass, classController, columns.indexOf("abstract"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserClass, classController, columns.indexOf("abstract"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, def->get_is_abstract, def->set_is_abstract); - ADD_PIXMAP_GETTER(BrowserClass, classController, columns.indexOf("name"),std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserClass, classController, columns.indexOf("name"),QVector({Qt::DecorationRole}), pixmap); classController->AddFlagsFunctor @@ -255,41 +255,41 @@ void QuickEdit::SetupOperationController() { operationController = QSharedPointer >( new ItemController()); operationController->SetColumns(columns); - ADD_GETSET(BrowserOperation, operationController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperation, operationController, columns.indexOf("name"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("type"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_return_type().get_type, set_return_type); - ADD_GETSET_CONVERTED(BrowserOperation, operationController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_CONVERTED(BrowserOperation, operationController, columns.indexOf("visibility"), QVector({Qt::DisplayRole,Qt::EditRole}), toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_uml_visibility); - ADD_GETSET(BrowserOperation, operationController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperation, operationController, columns.indexOf("deleted"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("static"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("static"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_isa_class_operation, set_isa_class_operation); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("abstract"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("abstract"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_is_abstract, set_is_abstract); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("const"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("const"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_const, set_cpp_const); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("volatile"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("volatile"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_is_volatile, set_is_volatile); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("friend"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("friend"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_friend, set_cpp_friend); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("virtual"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("virtual"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_virtual, set_cpp_virtual); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("inline"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("inline"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_inline, set_cpp_inline); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("defaulted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("defaulted"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_default, set_cpp_default); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("delete"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("delete"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_delete, set_cpp_delete); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("override"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("override"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_override, set_cpp_override); - ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("final"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserOperation, OperationData, operationController, columns.indexOf("final"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_cpp_final, set_cpp_final); std::function f = [](BrowserNode* node ,const QModelIndex& index) @@ -301,9 +301,9 @@ void QuickEdit::SetupOperationController() oper->package_modified(); oper->get_data()->modified(); }; - operationController->AddPostProcessors(columns.indexOf("name"), QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); + operationController->AddPostProcessors(columns.indexOf("name"), QVector(QVector({Qt::DisplayRole,Qt::EditRole})),f); - ADD_PIXMAP_GETTER(BrowserOperation, operationController, columns.indexOf("name"),std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserOperation, operationController, columns.indexOf("name"),QVector({Qt::DecorationRole}), pixmap); operationController->AddFlagsFunctor @@ -335,33 +335,33 @@ void QuickEdit::SetupAttributeController() { attributeController = QSharedPointer >( new ItemController()); attributeController->SetColumns(columns); - ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("name"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("type"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_type().get_type, set_type); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("default_value"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("default_value"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_init_value, set_init_value); - ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("stereotype"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("stereotype"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_stereotype, def->set_stereotype); - ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserAttribute, attributeController, columns.indexOf("deleted"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); -// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserAttribute, attributeController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// ADD_GETSET_DIRECT_ASSIGNMENT(BrowserAttribute, attributeController, columns.indexOf("visibility"), QVector({Qt::DisplayRole,Qt::EditRole}), // visibility_as_string(), BrowserNode::encode_visibility(value.toString())); - ADD_GETSET_CONVERTED(BrowserAttribute, attributeController, columns.indexOf("visibility"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_CONVERTED(BrowserAttribute, attributeController, columns.indexOf("visibility"), QVector({Qt::DisplayRole,Qt::EditRole}), toString,BrowserNode::encode_visibility,visibility_as_string, pointer->def->set_visibility); - ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("static"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DATA(BrowserAttribute, AttributeData, attributeController, columns.indexOf("static"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool,get_isa_class_attribute, set_isa_class_attribute); - ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserAttribute, attributeController, columns.indexOf("name"), QVector({Qt::DecorationRole}), pixmap); attributeController->AddFlagsFunctor ( @@ -395,31 +395,31 @@ void QuickEdit::SetupAttributeController() attr->package_modified(); attr->get_data()->modified(); }; - attributeController->AddPostProcessors(columns.indexOf("name"), QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); + attributeController->AddPostProcessors(columns.indexOf("name"), QVector(QVector({Qt::DisplayRole,Qt::EditRole})),f); } void QuickEdit::SetupOperationAttributeController() { operationAttributeController = QSharedPointer >( new ItemController()); operationAttributeController->SetColumns(columns); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("name"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("type"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("type"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_param_type().get_type, set_param_type); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("default_value"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("default_value"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_default_value, set_default_value); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("direction"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("direction"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_direction, set_direction); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("deleted"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); -// ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("prefix"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), +// ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("prefix"), QVector({Qt::DisplayRole,Qt::EditRole}), // toString, get_specifier, set_specifier); - ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("mark"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserOperationAttribute, operationAttributeController, columns.indexOf("mark"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, markedp, set_marked); - operationAttributeController->AddGetter(columns.indexOf("deleted"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + operationAttributeController->AddGetter(columns.indexOf("deleted"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (const BrowserNode* data, const QModelIndex& index) { Q_UNUSED(index); @@ -432,7 +432,7 @@ void QuickEdit::SetupOperationAttributeController() return QVariant(); } ); - operationAttributeController->AddSetter(columns.indexOf("deleted"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + operationAttributeController->AddSetter(columns.indexOf("deleted"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (BrowserNode* data, QVariant value, const QModelIndex& index) { if(!data) @@ -447,7 +447,7 @@ void QuickEdit::SetupOperationAttributeController() } ); - operationAttributeController->AddGetter(columns.indexOf("prefix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + operationAttributeController->AddGetter(columns.indexOf("prefix"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (const BrowserNode* data, const QModelIndex& index) { Q_UNUSED(index); @@ -460,7 +460,7 @@ void QuickEdit::SetupOperationAttributeController() return QVariant(); } ); - operationAttributeController->AddSetter(columns.indexOf("prefix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + operationAttributeController->AddSetter(columns.indexOf("prefix"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (BrowserNode* data, QVariant value, const QModelIndex& index) { if(!data) @@ -475,7 +475,7 @@ void QuickEdit::SetupOperationAttributeController() } ); - operationAttributeController->AddGetter(columns.indexOf("postfix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + operationAttributeController->AddGetter(columns.indexOf("postfix"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (const BrowserNode* data, const QModelIndex& index) { Q_UNUSED(index); @@ -488,7 +488,7 @@ void QuickEdit::SetupOperationAttributeController() return QVariant(); } ); - operationAttributeController->AddSetter(columns.indexOf("postfix"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + operationAttributeController->AddSetter(columns.indexOf("postfix"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (BrowserNode* data, QVariant value, const QModelIndex& index) { if(!data) @@ -512,9 +512,9 @@ void QuickEdit::SetupOperationAttributeController() BrowserOperationAttribute* oper = static_cast(node); OperationFuncs::recompute_param(oper->get_operation(),index.row(),true); }; - operationAttributeController->AddPostProcessors(columns.indexOf("direction"), QVector(std::initializer_list({Qt::DisplayRole,Qt::EditRole})),f); + operationAttributeController->AddPostProcessors(columns.indexOf("direction"), QVector(QVector({Qt::DisplayRole,Qt::EditRole})),f); - ADD_PIXMAP_GETTER(BrowserOperationAttribute, operationAttributeController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserOperationAttribute, operationAttributeController, columns.indexOf("name"), QVector({Qt::DecorationRole}), pixmap); @@ -550,20 +550,20 @@ void QuickEdit::SetupRelationController() relationController = QSharedPointer >( new ItemController()); relationController->SetColumns(columns); - ADD_GETSET(BrowserRelation, relationController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserRelation, relationController, columns.indexOf("name"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("default"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("default"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, def->a.init_value.operator QString()); - ADD_GETSET(BrowserRelation, relationController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserRelation, relationController, columns.indexOf("deleted"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); std::function f = [](RoleData& data, UmlVisibility vis){data.uml_visibility = vis;}; - ADD_PIXMAP_GETTER(BrowserRelation, relationController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserRelation, relationController, columns.indexOf("name"), QVector({Qt::DecorationRole}), pixmap); - relationController->AddGetter(columns.indexOf("visibility"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + relationController->AddGetter(columns.indexOf("visibility"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (const BrowserNode* data, const QModelIndex& index) { Q_UNUSED(index); @@ -576,7 +576,7 @@ void QuickEdit::SetupRelationController() return QVariant(); } ); - relationController->AddSetter(columns.indexOf("visibility"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + relationController->AddSetter(columns.indexOf("visibility"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (BrowserNode* data, QVariant value, const QModelIndex& index) { Q_UNUSED(index); @@ -591,12 +591,12 @@ void QuickEdit::SetupRelationController() ); - ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("static"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("static"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, def->a.isa_class_relation); - ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("multiplicity"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET_DIRECT(BrowserRelation, relationController, columns.indexOf("multiplicity"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, def->a.multiplicity.operator QString()); - relationController->AddGetter(columns.indexOf("type"),std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + relationController->AddGetter(columns.indexOf("type"),QVector({Qt::DisplayRole,Qt::EditRole}), [] (const BrowserNode* data, const QModelIndex& ) { @@ -609,7 +609,7 @@ void QuickEdit::SetupRelationController() return QVariant(); } ); - relationController->AddSetter(1,std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + relationController->AddSetter(1,QVector({Qt::DisplayRole,Qt::EditRole}), [] (BrowserNode* data, QVariant value, const QModelIndex& ) { if(!data) @@ -650,13 +650,13 @@ void QuickEdit::SetupExtraNodeController() extraNodeController = QSharedPointer >( new ItemController()); extraNodeController->SetColumns(columns); - ADD_GETSET(BrowserExtraMember, extraNodeController, columns.indexOf("name"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserExtraMember, extraNodeController, columns.indexOf("name"), QVector({Qt::DisplayRole,Qt::EditRole}), toString, get_name, set_name); - ADD_GETSET(BrowserExtraMember, extraNodeController, columns.indexOf("deleted"), std::initializer_list({Qt::DisplayRole,Qt::EditRole}), + ADD_GETSET(BrowserExtraMember, extraNodeController, columns.indexOf("deleted"), QVector({Qt::DisplayRole,Qt::EditRole}), toBool, deletedp, set_deleted); - ADD_PIXMAP_GETTER(BrowserExtraMember, extraNodeController, columns.indexOf("name"), std::initializer_list({Qt::DecorationRole}), pixmap); + ADD_PIXMAP_GETTER(BrowserExtraMember, extraNodeController, columns.indexOf("name"), QVector({Qt::DecorationRole}), pixmap); extraNodeController->AddFlagsFunctor ( From fb56b880189eb203ef7c75d35c9813256f8e9335 Mon Sep 17 00:00:00 2001 From: Guilherme Brondani Torri Date: Thu, 11 Jul 2013 09:55:48 +0200 Subject: [PATCH 122/297] add llvm std lib to linker otherwise I get __next_prime symbol undefined --- src/douml.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/src/douml.pro b/src/douml.pro index 77a191389..b97882737 100644 --- a/src/douml.pro +++ b/src/douml.pro @@ -548,6 +548,7 @@ Debug { QMAKE_CXXFLAGS += -std=gnu++11 mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ +mac:LIBS += -lc++ LIBS += -L../bin -lUniversalModels RESOURCES += icons.qrc ../douml.qrc From db92d1fb35625d79ccad7399b72e63ac9f678525 Mon Sep 17 00:00:00 2001 From: Guilherme Brondani Torri Date: Thu, 11 Jul 2013 10:03:42 +0200 Subject: [PATCH 123/297] fix type redefinition Lex.cpp:477:17: error: redefinition of 'c' with a different type: 'const char *' vs 'int' --- src/CppReverse/Lex.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CppReverse/Lex.cpp b/src/CppReverse/Lex.cpp index e30516d55..2807a6e19 100644 --- a/src/CppReverse/Lex.cpp +++ b/src/CppReverse/Lex.cpp @@ -474,8 +474,8 @@ WrapperStr Lex::manage_operator(QString & result, int c, bool oper) QLOG_INFO() << "retourne '" << result << "'\n"; #endif QByteArray temp = result.toAscii(); - const char* c = temp.constData(); - return WrapperStr(c); + const char* ch = temp.constData(); + return WrapperStr(ch); } char Lex::bypass_operator(int c, bool oper) From ca0af24e524bf42ffebfea63ccee507829f5b274 Mon Sep 17 00:00:00 2001 From: Guilherme Brondani Torri Date: Thu, 11 Jul 2013 10:15:22 +0200 Subject: [PATCH 124/297] add -lc++ to Xmi2Generator --- genplugouts/Xmi2Generator/Xmi2Generator.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/genplugouts/Xmi2Generator/Xmi2Generator.pro b/genplugouts/Xmi2Generator/Xmi2Generator.pro index e908af5ee..30ba75b78 100644 --- a/genplugouts/Xmi2Generator/Xmi2Generator.pro +++ b/genplugouts/Xmi2Generator/Xmi2Generator.pro @@ -433,6 +433,7 @@ INCLUDEPATH += ../../src CONFIG += qtestlib QMAKE_CXXFLAGS += -std=gnu++11 mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ +mac:LIBS += -lc++ UI_DIR = src/ui DESTDIR = ../../bin From 250a1a74ff825b35aa53e911b88192f2e48065ef Mon Sep 17 00:00:00 2001 From: Guilherme Brondani Torri Date: Thu, 11 Jul 2013 10:33:56 +0200 Subject: [PATCH 125/297] git ignore .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 53d5b86f8..31d0a5ff4 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ src/CppReverse/cpp_reverse !/bin/settings.ini !src/settings_ini.h /install/ +.DS_Store From 69f9b61961d52c03afc45fc870e691b5f968a6e8 Mon Sep 17 00:00:00 2001 From: Clemens Date: Sun, 9 Feb 2014 18:31:55 +0100 Subject: [PATCH 126/297] Update quickedit.cpp Compiling the code throws an error here (something like the class is abstract...); the QList items is not needed in the function so it can be removed anway... --- src/CustomWidgets/quickedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index b91839d8a..fa9a24fbd 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -695,7 +695,7 @@ void QuickEdit::AssignItemsForClass(QSharedPointer root, Bro QList children = classNode->children(validTypes); std::reverse(children.begin(), children.end()); - QList items; + //QList items; for(BrowserNode* child : children) { if(!child) From 46c715f63bac29399a5a0d132a8f5e6e87a97b95 Mon Sep 17 00:00:00 2001 From: pasgui Date: Sun, 30 Mar 2014 13:16:00 +0200 Subject: [PATCH 127/297] =?UTF-8?q?Fixes:=20cannot=20allocate=20an=20objec?= =?UTF-8?q?t=20of=20abstract=20type=20=E2=80=98TreeItemInterface=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CustomWidgets/quickedit.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CustomWidgets/quickedit.cpp b/src/CustomWidgets/quickedit.cpp index b91839d8a..9cb17daff 100644 --- a/src/CustomWidgets/quickedit.cpp +++ b/src/CustomWidgets/quickedit.cpp @@ -695,7 +695,6 @@ void QuickEdit::AssignItemsForClass(QSharedPointer root, Bro QList children = classNode->children(validTypes); std::reverse(children.begin(), children.end()); - QList items; for(BrowserNode* child : children) { if(!child) From 83f4258f52de6a3f48de3033b1ada25dd4bbffba Mon Sep 17 00:00:00 2001 From: Leonardo Date: Thu, 22 May 2014 20:36:47 -0300 Subject: [PATCH 128/297] [80] Applying mageia linux fix for missing functional header --- genplugouts/Xmi2Generator/FileOut.cpp | 1 + src/Libs/L_UniversalModels/include/TableDataInterface.h | 1 + 2 files changed, 2 insertions(+) diff --git a/genplugouts/Xmi2Generator/FileOut.cpp b/genplugouts/Xmi2Generator/FileOut.cpp index af1d6fa6a..58c4e55e2 100644 --- a/genplugouts/Xmi2Generator/FileOut.cpp +++ b/genplugouts/Xmi2Generator/FileOut.cpp @@ -7,6 +7,7 @@ #include //Added by qt3to4: #include "misc/mystr.h" +#include // std::function FileOut::FileOut(QFile * fp, bool lf, bool utf8) : Q3TextStream(fp), _lf(lf), _indent(0) { if (utf8) diff --git a/src/Libs/L_UniversalModels/include/TableDataInterface.h b/src/Libs/L_UniversalModels/include/TableDataInterface.h index e2bca9e57..f07fb599b 100644 --- a/src/Libs/L_UniversalModels/include/TableDataInterface.h +++ b/src/Libs/L_UniversalModels/include/TableDataInterface.h @@ -31,6 +31,7 @@ #include #include "l_tree_controller_global.h" +#include // std::function From 2b5f514d4e898d051727442c0508269a7d96fad2 Mon Sep 17 00:00:00 2001 From: Leonardo Date: Thu, 22 May 2014 20:47:24 -0300 Subject: [PATCH 129/297] [82] Use xdg-open for help --- src/dialog/HelpDialog.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dialog/HelpDialog.cpp b/src/dialog/HelpDialog.cpp index 36e5a4f69..38191d8d1 100644 --- a/src/dialog/HelpDialog.cpp +++ b/src/dialog/HelpDialog.cpp @@ -144,6 +144,9 @@ void HelpDialog::show(QString topic) dirs[0] = ManualDir; DocDir = ""; + if (NavigatorPath.isEmpty()) + NavigatorPath = "/usr/bin/xdg-open"; + for (index = (ManualDir.isEmpty()) ? 1 : 0; index != sizeof(dirs) / sizeof(*dirs); index += 1) { From 65adc114375086245a09c8f2ae26e8b0dcca5e19 Mon Sep 17 00:00:00 2001 From: pasgui Date: Thu, 29 May 2014 17:10:14 +0200 Subject: [PATCH 130/297] Fixes plugout path --- src/tool/ToolCom.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tool/ToolCom.cpp b/src/tool/ToolCom.cpp index 0562002db..4ad7f7d40 100644 --- a/src/tool/ToolCom.cpp +++ b/src/tool/ToolCom.cpp @@ -203,7 +203,8 @@ int ToolCom::run(const char * cmd, BrowserNode * bn, arguments.append(commandList << QString::number(port)); com->exitStaged = exit; #ifdef Q_OS_UNIX - com->externalProcess->start("./" + command, arguments); + qDebug() << QCoreApplication::applicationDirPath() + "/" + command; + com->externalProcess->start(QCoreApplication::applicationDirPath() + "/" + command, arguments); #endif #ifdef Q_OS_WIN com->externalProcess->start(command, arguments); From d31ebb1d72d7fe2b407ddf9f97ef5e8a473a60a4 Mon Sep 17 00:00:00 2001 From: habipyesilyurt Date: Sun, 26 Apr 2015 11:08:58 +0300 Subject: [PATCH 131/297] Qt5 migration Project poorted to qt5. Since there are so many difference between Qt4 and Qt5 (most important was removal of Qt3 support), nearly all of files changed. So many bugs expected. --- .gitignore | 1 + .gitignore.bak | 108 + bin/settings.ini | 15 +- genplugouts/BrowserSort/BrowserSort.pro | 4 +- genplugouts/BrowserSort/CppSettings.cpp | 208 +- genplugouts/BrowserSort/CppSettings.h | 182 +- genplugouts/BrowserSort/FlowBehavior.h | 10 +- genplugouts/BrowserSort/IdlSettings.cpp | 188 +- genplugouts/BrowserSort/IdlSettings.h | 160 +- genplugouts/BrowserSort/IdlSettingsCmd.h | 2 +- genplugouts/BrowserSort/JavaSettings.cpp | 152 +- genplugouts/BrowserSort/JavaSettings.h | 124 +- genplugouts/BrowserSort/JavaSettingsCmd.h | 2 +- genplugouts/BrowserSort/PackageGlobalCmd.h | 6 +- genplugouts/BrowserSort/StateBehavior.h | 8 +- genplugouts/BrowserSort/TransitionBehavior.h | 8 +- .../UmlAccessVariableValueAction.h | 4 +- genplugouts/BrowserSort/UmlActivity.h | 4 +- genplugouts/BrowserSort/UmlActivityAction.h | 4 +- .../BrowserSort/UmlActivityActionClasses.h | 30 +- .../BrowserSort/UmlActivityControlNode.h | 4 +- .../UmlActivityControlNodeClasses.h | 16 +- genplugouts/BrowserSort/UmlActivityDiagram.h | 4 +- genplugouts/BrowserSort/UmlActivityNode.h | 4 +- genplugouts/BrowserSort/UmlActivityObject.h | 4 +- .../BrowserSort/UmlActivityParameter.h | 4 +- genplugouts/BrowserSort/UmlActivityPin.h | 4 +- genplugouts/BrowserSort/UmlActivityRegion.h | 4 +- genplugouts/BrowserSort/UmlArtifact.h | 4 +- genplugouts/BrowserSort/UmlAttribute.h | 4 +- .../UmlBaseAccessVariableValueAction.h | 4 +- genplugouts/BrowserSort/UmlBaseActivity.cpp | 14 +- genplugouts/BrowserSort/UmlBaseActivity.h | 28 +- .../BrowserSort/UmlBaseActivityAction.cpp | 14 +- .../BrowserSort/UmlBaseActivityAction.h | 28 +- .../UmlBaseActivityActionClasses.cpp | 20 +- .../UmlBaseActivityActionClasses.h | 66 +- .../BrowserSort/UmlBaseActivityControlNode.h | 4 +- .../UmlBaseActivityControlNodeClasses.h | 16 +- .../BrowserSort/UmlBaseActivityDiagram.h | 4 +- genplugouts/BrowserSort/UmlBaseActivityNode.h | 4 +- .../BrowserSort/UmlBaseActivityObject.cpp | 12 +- .../BrowserSort/UmlBaseActivityObject.h | 24 +- .../BrowserSort/UmlBaseActivityParameter.cpp | 4 +- .../BrowserSort/UmlBaseActivityParameter.h | 8 +- genplugouts/BrowserSort/UmlBaseActivityPin.h | 4 +- .../BrowserSort/UmlBaseActivityRegion.h | 4 +- genplugouts/BrowserSort/UmlBaseArtifact.cpp | 50 +- genplugouts/BrowserSort/UmlBaseArtifact.h | 42 +- genplugouts/BrowserSort/UmlBaseAttribute.cpp | 6 +- genplugouts/BrowserSort/UmlBaseAttribute.h | 14 +- .../BrowserSort/UmlBaseChoicePseudoState.h | 4 +- genplugouts/BrowserSort/UmlBaseClass.cpp | 32 +- genplugouts/BrowserSort/UmlBaseClass.h | 22 +- genplugouts/BrowserSort/UmlBaseClassDiagram.h | 4 +- genplugouts/BrowserSort/UmlBaseClassItem.cpp | 8 +- genplugouts/BrowserSort/UmlBaseClassItem.h | 16 +- .../BrowserSort/UmlBaseClassMember.cpp | 4 +- genplugouts/BrowserSort/UmlBaseClassMember.h | 8 +- genplugouts/BrowserSort/UmlBaseClassView.h | 4 +- .../BrowserSort/UmlBaseCollaborationDiagram.h | 4 +- genplugouts/BrowserSort/UmlBaseComponent.cpp | 14 +- genplugouts/BrowserSort/UmlBaseComponent.h | 22 +- .../BrowserSort/UmlBaseComponentDiagram.h | 4 +- .../BrowserSort/UmlBaseComponentView.h | 4 +- .../UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/BrowserSort/UmlBaseDeployment.h | 4 +- .../BrowserSort/UmlBaseDeploymentDiagram.h | 4 +- .../BrowserSort/UmlBaseDeploymentView.h | 4 +- genplugouts/BrowserSort/UmlBaseDiagram.cpp | 4 +- genplugouts/BrowserSort/UmlBaseDiagram.h | 6 +- .../UmlBaseEntryPointPseudoState.h | 4 +- .../BrowserSort/UmlBaseExitPointPseudoState.h | 4 +- .../BrowserSort/UmlBaseExpansionNode.h | 4 +- .../BrowserSort/UmlBaseExpansionRegion.h | 4 +- .../BrowserSort/UmlBaseExtraClassMember.cpp | 4 +- .../BrowserSort/UmlBaseExtraClassMember.h | 8 +- genplugouts/BrowserSort/UmlBaseFinalState.h | 4 +- genplugouts/BrowserSort/UmlBaseFlow.cpp | 26 +- genplugouts/BrowserSort/UmlBaseFlow.h | 28 +- .../BrowserSort/UmlBaseForkPseudoState.h | 4 +- .../BrowserSort/UmlBaseFormalParameter.h | 10 +- .../BrowserSort/UmlBaseInitialPseudoState.h | 4 +- .../UmlBaseInterruptibleActivityRegion.h | 4 +- genplugouts/BrowserSort/UmlBaseItem.cpp | 65 +- genplugouts/BrowserSort/UmlBaseItem.h | 55 +- .../BrowserSort/UmlBaseJoinPseudoState.h | 4 +- .../BrowserSort/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/BrowserSort/UmlBaseNcRelation.h | 6 +- genplugouts/BrowserSort/UmlBaseNode.h | 4 +- .../BrowserSort/UmlBaseObjectDiagram.h | 4 +- .../BrowserSort/UmlBaseOnSignalAction.cpp | 8 +- .../BrowserSort/UmlBaseOnSignalAction.h | 16 +- genplugouts/BrowserSort/UmlBaseOperation.cpp | 34 +- genplugouts/BrowserSort/UmlBaseOperation.h | 38 +- genplugouts/BrowserSort/UmlBasePackage.cpp | 44 +- genplugouts/BrowserSort/UmlBasePackage.h | 56 +- .../BrowserSort/UmlBaseParameterSet.cpp | 8 +- genplugouts/BrowserSort/UmlBaseParameterSet.h | 14 +- genplugouts/BrowserSort/UmlBasePinParameter.h | 4 +- genplugouts/BrowserSort/UmlBaseRegion.h | 4 +- genplugouts/BrowserSort/UmlBaseRelation.cpp | 12 +- genplugouts/BrowserSort/UmlBaseRelation.h | 24 +- .../BrowserSort/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/BrowserSort/UmlBaseState.cpp | 20 +- genplugouts/BrowserSort/UmlBaseState.h | 22 +- .../BrowserSort/UmlBaseStateAction.cpp | 8 +- genplugouts/BrowserSort/UmlBaseStateAction.h | 16 +- genplugouts/BrowserSort/UmlBaseStateDiagram.h | 4 +- .../BrowserSort/UmlBaseTerminatePseudoState.h | 4 +- genplugouts/BrowserSort/UmlBaseTransition.cpp | 20 +- genplugouts/BrowserSort/UmlBaseTransition.h | 22 +- genplugouts/BrowserSort/UmlBaseUseCase.cpp | 2 + genplugouts/BrowserSort/UmlBaseUseCase.h | 5 +- .../BrowserSort/UmlBaseUseCaseDiagram.h | 4 +- genplugouts/BrowserSort/UmlBaseUseCaseView.h | 4 +- genplugouts/BrowserSort/UmlBuiltin.h | 20 +- genplugouts/BrowserSort/UmlClass.h | 4 +- genplugouts/BrowserSort/UmlClassDiagram.h | 4 +- genplugouts/BrowserSort/UmlClassItem.h | 4 +- genplugouts/BrowserSort/UmlClassMember.h | 4 +- genplugouts/BrowserSort/UmlClassView.h | 4 +- .../BrowserSort/UmlCollaborationDiagram.h | 4 +- genplugouts/BrowserSort/UmlCom.cpp | 41 +- genplugouts/BrowserSort/UmlCom.h | 22 +- genplugouts/BrowserSort/UmlComponent.h | 4 +- genplugouts/BrowserSort/UmlComponentDiagram.h | 4 +- genplugouts/BrowserSort/UmlComponentView.h | 4 +- .../BrowserSort/UmlDeploymentDiagram.h | 4 +- genplugouts/BrowserSort/UmlDeploymentView.h | 4 +- genplugouts/BrowserSort/UmlDiagram.h | 4 +- .../BrowserSort/UmlEntryPointPseudoState.h | 4 +- .../BrowserSort/UmlExitPointPseudoState.h | 4 +- genplugouts/BrowserSort/UmlExpansionNode.h | 4 +- genplugouts/BrowserSort/UmlExpansionRegion.h | 4 +- genplugouts/BrowserSort/UmlExtraClassMember.h | 4 +- genplugouts/BrowserSort/UmlFlow.h | 4 +- .../UmlInterruptibleActivityRegion.h | 4 +- genplugouts/BrowserSort/UmlItem.cpp | 12 +- genplugouts/BrowserSort/UmlItem.h | 13 +- genplugouts/BrowserSort/UmlNcRelation.h | 4 +- genplugouts/BrowserSort/UmlNode.h | 4 +- genplugouts/BrowserSort/UmlObjectDiagram.h | 4 +- genplugouts/BrowserSort/UmlOnSignalAction.h | 4 +- genplugouts/BrowserSort/UmlOperation.h | 4 +- genplugouts/BrowserSort/UmlPackage.h | 4 +- genplugouts/BrowserSort/UmlParameter.h | 6 +- genplugouts/BrowserSort/UmlParameterSet.h | 4 +- genplugouts/BrowserSort/UmlPinParameter.h | 4 +- genplugouts/BrowserSort/UmlPseudoState.h | 4 +- genplugouts/BrowserSort/UmlRegion.h | 4 +- genplugouts/BrowserSort/UmlRelation.h | 4 +- genplugouts/BrowserSort/UmlSequenceDiagram.h | 4 +- genplugouts/BrowserSort/UmlSettings.cpp | 66 +- genplugouts/BrowserSort/UmlSettings.h | 57 +- genplugouts/BrowserSort/UmlState.h | 4 +- genplugouts/BrowserSort/UmlStateDiagram.h | 4 +- genplugouts/BrowserSort/UmlStereotype.h | 10 +- genplugouts/BrowserSort/UmlTransition.h | 4 +- genplugouts/BrowserSort/UmlTypeSpec.cpp | 4 +- genplugouts/BrowserSort/UmlTypeSpec.h | 9 +- genplugouts/BrowserSort/UmlUseCase.h | 4 +- genplugouts/BrowserSort/UmlUseCaseDiagram.h | 4 +- genplugouts/BrowserSort/UmlUseCaseView.h | 4 +- .../CppUtilities/ConstrDestrCopyDialog.cpp | 127 +- genplugouts/CppUtilities/CppSettings.cpp | 248 +- genplugouts/CppUtilities/CppSettings.h | 198 +- genplugouts/CppUtilities/CppUtilities.pro | 18 +- genplugouts/CppUtilities/FlowBehavior.h | 10 +- genplugouts/CppUtilities/IdlSettings.cpp | 186 +- genplugouts/CppUtilities/IdlSettings.h | 160 +- genplugouts/CppUtilities/JavaSettings.cpp | 150 +- genplugouts/CppUtilities/JavaSettings.h | 124 +- genplugouts/CppUtilities/PhpSettings.cpp | 116 +- genplugouts/CppUtilities/PhpSettings.h | 102 +- genplugouts/CppUtilities/PythonSettings.cpp | 126 +- genplugouts/CppUtilities/PythonSettings.h | 104 +- genplugouts/CppUtilities/SlotAttribute.h | 9 +- genplugouts/CppUtilities/StateBehavior.h | 8 +- genplugouts/CppUtilities/TransitionBehavior.h | 8 +- .../UmlAccessVariableValueAction.h | 4 +- genplugouts/CppUtilities/UmlActivity.h | 4 +- genplugouts/CppUtilities/UmlActivityAction.h | 4 +- .../CppUtilities/UmlActivityActionClasses.h | 44 +- .../CppUtilities/UmlActivityControlNode.h | 4 +- .../UmlActivityControlNodeClasses.h | 16 +- genplugouts/CppUtilities/UmlActivityDiagram.h | 4 +- genplugouts/CppUtilities/UmlActivityNode.h | 4 +- genplugouts/CppUtilities/UmlActivityObject.h | 4 +- .../CppUtilities/UmlActivityParameter.h | 4 +- .../CppUtilities/UmlActivityPartition.h | 4 +- genplugouts/CppUtilities/UmlActivityPin.h | 4 +- genplugouts/CppUtilities/UmlActivityRegion.h | 4 +- genplugouts/CppUtilities/UmlArtifact.h | 4 +- genplugouts/CppUtilities/UmlAttribute.h | 4 +- .../UmlBaseAccessVariableValueAction.h | 4 +- genplugouts/CppUtilities/UmlBaseActivity.cpp | 14 +- genplugouts/CppUtilities/UmlBaseActivity.h | 28 +- .../CppUtilities/UmlBaseActivityAction.cpp | 14 +- .../CppUtilities/UmlBaseActivityAction.h | 28 +- .../UmlBaseActivityActionClasses.cpp | 34 +- .../UmlBaseActivityActionClasses.h | 108 +- .../CppUtilities/UmlBaseActivityControlNode.h | 4 +- .../UmlBaseActivityControlNodeClasses.h | 16 +- .../CppUtilities/UmlBaseActivityDiagram.h | 4 +- .../CppUtilities/UmlBaseActivityNode.h | 4 +- .../CppUtilities/UmlBaseActivityObject.cpp | 12 +- .../CppUtilities/UmlBaseActivityObject.h | 24 +- .../CppUtilities/UmlBaseActivityParameter.cpp | 4 +- .../CppUtilities/UmlBaseActivityParameter.h | 8 +- .../CppUtilities/UmlBaseActivityPartition.h | 4 +- genplugouts/CppUtilities/UmlBaseActivityPin.h | 4 +- .../CppUtilities/UmlBaseActivityRegion.h | 4 +- genplugouts/CppUtilities/UmlBaseArtifact.cpp | 56 +- genplugouts/CppUtilities/UmlBaseArtifact.h | 54 +- genplugouts/CppUtilities/UmlBaseAttribute.cpp | 8 +- genplugouts/CppUtilities/UmlBaseAttribute.h | 18 +- .../CppUtilities/UmlBaseChoicePseudoState.h | 4 +- genplugouts/CppUtilities/UmlBaseClass.cpp | 34 +- genplugouts/CppUtilities/UmlBaseClass.h | 24 +- .../CppUtilities/UmlBaseClassDiagram.h | 4 +- .../CppUtilities/UmlBaseClassInstance.cpp | 20 +- .../CppUtilities/UmlBaseClassInstance.h | 16 +- .../UmlBaseClassInstanceReference.cpp | 4 +- .../UmlBaseClassInstanceReference.h | 9 +- genplugouts/CppUtilities/UmlBaseClassItem.cpp | 12 +- genplugouts/CppUtilities/UmlBaseClassItem.h | 24 +- .../CppUtilities/UmlBaseClassMember.cpp | 6 +- genplugouts/CppUtilities/UmlBaseClassMember.h | 12 +- genplugouts/CppUtilities/UmlBaseClassView.h | 4 +- .../UmlBaseCollaborationDiagram.h | 4 +- .../UmlBaseCollaborationDiagramDefinition.cpp | 6 +- .../UmlBaseCollaborationDiagramDefinition.h | 10 +- .../UmlBaseCollaborationMessage.cpp | 2 +- .../UmlBaseCollaborationMessage.h | 10 +- genplugouts/CppUtilities/UmlBaseComponent.cpp | 14 +- genplugouts/CppUtilities/UmlBaseComponent.h | 23 +- .../CppUtilities/UmlBaseComponentDiagram.h | 4 +- .../CppUtilities/UmlBaseComponentView.h | 4 +- .../UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/CppUtilities/UmlBaseDeployment.h | 4 +- .../CppUtilities/UmlBaseDeploymentDiagram.h | 4 +- .../CppUtilities/UmlBaseDeploymentView.h | 4 +- genplugouts/CppUtilities/UmlBaseDiagram.cpp | 4 +- genplugouts/CppUtilities/UmlBaseDiagram.h | 6 +- .../UmlBaseEntryPointPseudoState.h | 4 +- .../UmlBaseExitPointPseudoState.h | 4 +- .../CppUtilities/UmlBaseExpansionNode.h | 4 +- .../CppUtilities/UmlBaseExpansionRegion.h | 4 +- .../CppUtilities/UmlBaseExtraClassMember.cpp | 4 +- .../CppUtilities/UmlBaseExtraClassMember.h | 8 +- genplugouts/CppUtilities/UmlBaseFinalState.h | 4 +- genplugouts/CppUtilities/UmlBaseFlow.cpp | 26 +- genplugouts/CppUtilities/UmlBaseFlow.h | 28 +- .../CppUtilities/UmlBaseForkPseudoState.h | 4 +- .../CppUtilities/UmlBaseFormalParameter.h | 10 +- genplugouts/CppUtilities/UmlBaseFragment.cpp | 8 +- genplugouts/CppUtilities/UmlBaseFragment.h | 31 +- .../UmlBaseFragmentCompartment.cpp | 16 +- .../CppUtilities/UmlBaseFragmentCompartment.h | 24 +- .../CppUtilities/UmlBaseInitialPseudoState.h | 4 +- .../UmlBaseInterruptibleActivityRegion.h | 4 +- genplugouts/CppUtilities/UmlBaseItem.cpp | 863 +- genplugouts/CppUtilities/UmlBaseItem.h | 54 +- .../CppUtilities/UmlBaseJoinPseudoState.h | 4 +- .../CppUtilities/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/CppUtilities/UmlBaseMessage.cpp | 2 +- genplugouts/CppUtilities/UmlBaseMessage.h | 13 +- genplugouts/CppUtilities/UmlBaseNcRelation.h | 6 +- genplugouts/CppUtilities/UmlBaseNode.h | 4 +- .../CppUtilities/UmlBaseObjectDiagram.h | 4 +- .../CppUtilities/UmlBaseOnSignalAction.cpp | 8 +- .../CppUtilities/UmlBaseOnSignalAction.h | 16 +- genplugouts/CppUtilities/UmlBaseOperation.cpp | 48 +- genplugouts/CppUtilities/UmlBaseOperation.h | 62 +- genplugouts/CppUtilities/UmlBasePackage.cpp | 54 +- genplugouts/CppUtilities/UmlBasePackage.h | 78 +- genplugouts/CppUtilities/UmlBaseParameter.h | 6 +- .../CppUtilities/UmlBaseParameterSet.cpp | 8 +- .../CppUtilities/UmlBaseParameterSet.h | 13 +- .../CppUtilities/UmlBasePinParameter.h | 4 +- genplugouts/CppUtilities/UmlBaseRegion.h | 4 +- genplugouts/CppUtilities/UmlBaseRelation.cpp | 12 +- genplugouts/CppUtilities/UmlBaseRelation.h | 24 +- .../CppUtilities/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseSequenceDiagramDefinition.cpp | 14 +- .../UmlBaseSequenceDiagramDefinition.h | 14 +- .../CppUtilities/UmlBaseSequenceMessage.cpp | 2 +- .../CppUtilities/UmlBaseSequenceMessage.h | 12 +- .../UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/CppUtilities/UmlBaseState.cpp | 20 +- genplugouts/CppUtilities/UmlBaseState.h | 22 +- .../CppUtilities/UmlBaseStateAction.cpp | 8 +- genplugouts/CppUtilities/UmlBaseStateAction.h | 16 +- .../CppUtilities/UmlBaseStateDiagram.h | 4 +- genplugouts/CppUtilities/UmlBaseSubject.cpp | 2 +- genplugouts/CppUtilities/UmlBaseSubject.h | 13 +- .../UmlBaseTerminatePseudoState.h | 4 +- .../CppUtilities/UmlBaseTransition.cpp | 20 +- genplugouts/CppUtilities/UmlBaseTransition.h | 20 +- genplugouts/CppUtilities/UmlBaseTypeSpec.cpp | 4 +- genplugouts/CppUtilities/UmlBaseTypeSpec.h | 9 +- genplugouts/CppUtilities/UmlBaseUseCase.cpp | 4 +- genplugouts/CppUtilities/UmlBaseUseCase.h | 8 +- .../UmlBaseUseCaseAssociation.cpp | 2 +- .../CppUtilities/UmlBaseUseCaseAssociation.h | 17 +- .../CppUtilities/UmlBaseUseCaseDiagram.h | 4 +- .../UmlBaseUseCaseDiagramDefinition.cpp | 10 +- .../UmlBaseUseCaseDiagramDefinition.h | 24 +- .../CppUtilities/UmlBaseUseCaseReference.cpp | 2 +- .../CppUtilities/UmlBaseUseCaseReference.h | 6 +- genplugouts/CppUtilities/UmlBaseUseCaseView.h | 4 +- genplugouts/CppUtilities/UmlBaseView.h | 4 +- genplugouts/CppUtilities/UmlBuiltin.h | 18 +- genplugouts/CppUtilities/UmlClass.cpp | 65 +- genplugouts/CppUtilities/UmlClass.h | 4 +- genplugouts/CppUtilities/UmlClassDiagram.h | 4 +- genplugouts/CppUtilities/UmlClassInstance.h | 4 +- genplugouts/CppUtilities/UmlClassItem.h | 4 +- genplugouts/CppUtilities/UmlClassMember.h | 4 +- genplugouts/CppUtilities/UmlClassView.h | 4 +- .../CppUtilities/UmlCollaborationDiagram.h | 4 +- genplugouts/CppUtilities/UmlCom.cpp | 46 +- genplugouts/CppUtilities/UmlCom.h | 21 +- genplugouts/CppUtilities/UmlComponent.h | 4 +- .../CppUtilities/UmlComponentDiagram.h | 4 +- genplugouts/CppUtilities/UmlComponentView.h | 4 +- .../CppUtilities/UmlDeploymentDiagram.h | 4 +- genplugouts/CppUtilities/UmlDeploymentView.h | 4 +- genplugouts/CppUtilities/UmlDiagram.h | 4 +- .../CppUtilities/UmlEntryPointPseudoState.h | 4 +- .../CppUtilities/UmlExitPointPseudoState.h | 4 +- genplugouts/CppUtilities/UmlExpansionNode.h | 4 +- genplugouts/CppUtilities/UmlExpansionRegion.h | 4 +- .../CppUtilities/UmlExtraClassMember.h | 4 +- genplugouts/CppUtilities/UmlFlow.h | 4 +- .../UmlInterruptibleActivityRegion.h | 4 +- genplugouts/CppUtilities/UmlItem.h | 4 +- genplugouts/CppUtilities/UmlNcRelation.h | 4 +- genplugouts/CppUtilities/UmlNode.h | 4 +- genplugouts/CppUtilities/UmlObjectDiagram.h | 4 +- genplugouts/CppUtilities/UmlOnSignalAction.h | 4 +- genplugouts/CppUtilities/UmlOperation.h | 4 +- genplugouts/CppUtilities/UmlPackage.h | 4 +- genplugouts/CppUtilities/UmlParameterSet.h | 4 +- genplugouts/CppUtilities/UmlPinParameter.h | 4 +- genplugouts/CppUtilities/UmlPseudoState.h | 4 +- genplugouts/CppUtilities/UmlRegion.h | 4 +- genplugouts/CppUtilities/UmlRelation.h | 4 +- genplugouts/CppUtilities/UmlSequenceDiagram.h | 4 +- genplugouts/CppUtilities/UmlSettings.cpp | 72 +- genplugouts/CppUtilities/UmlSettings.h | 57 +- genplugouts/CppUtilities/UmlState.h | 4 +- genplugouts/CppUtilities/UmlStateDiagram.h | 4 +- genplugouts/CppUtilities/UmlStereotype.h | 14 +- genplugouts/CppUtilities/UmlUseCase.h | 4 +- genplugouts/CppUtilities/UmlUseCaseDiagram.h | 4 +- genplugouts/CppUtilities/UmlUseCaseView.h | 4 +- genplugouts/CppUtilities/UmlView.h | 4 +- genplugouts/CppUtilities/gridbox.cpp | 37 + genplugouts/CppUtilities/gridbox.h | 26 + genplugouts/CppUtilities/hhbox.cpp | 29 + genplugouts/CppUtilities/hhbox.h | 22 + genplugouts/CppUtilities/vvbox.cpp | 25 + genplugouts/CppUtilities/vvbox.h | 22 + genplugouts/FileControl/CppSettings.cpp | 208 +- genplugouts/FileControl/CppSettings.h | 182 +- genplugouts/FileControl/Dialog.cpp | 62 +- genplugouts/FileControl/Dialog.h | 6 +- genplugouts/FileControl/FileControl.pro | 14 +- genplugouts/FileControl/IdlSettings.cpp | 188 +- genplugouts/FileControl/IdlSettings.h | 160 +- genplugouts/FileControl/IdlSettingsCmd.h | 2 +- genplugouts/FileControl/JavaSettings.cpp | 142 +- genplugouts/FileControl/JavaSettings.h | 112 +- genplugouts/FileControl/JavaSettingsCmd.h | 4 +- genplugouts/FileControl/PackageGlobalCmd.h | 6 +- genplugouts/FileControl/StateBehavior.h | 8 +- genplugouts/FileControl/TransitionBehavior.h | 8 +- genplugouts/FileControl/UmlArtifact.h | 4 +- genplugouts/FileControl/UmlAttribute.h | 4 +- genplugouts/FileControl/UmlBaseArtifact.cpp | 46 +- genplugouts/FileControl/UmlBaseArtifact.h | 42 +- genplugouts/FileControl/UmlBaseAttribute.cpp | 6 +- genplugouts/FileControl/UmlBaseAttribute.h | 14 +- .../FileControl/UmlBaseChoicePseudoState.h | 4 +- genplugouts/FileControl/UmlBaseClass.cpp | 32 +- genplugouts/FileControl/UmlBaseClass.h | 23 +- genplugouts/FileControl/UmlBaseClassDiagram.h | 4 +- genplugouts/FileControl/UmlBaseClassItem.cpp | 8 +- genplugouts/FileControl/UmlBaseClassItem.h | 16 +- genplugouts/FileControl/UmlBaseClassMember.h | 4 +- genplugouts/FileControl/UmlBaseClassView.h | 4 +- .../FileControl/UmlBaseCollaborationDiagram.h | 4 +- genplugouts/FileControl/UmlBaseComponent.cpp | 14 +- genplugouts/FileControl/UmlBaseComponent.h | 24 +- .../FileControl/UmlBaseComponentDiagram.h | 4 +- .../FileControl/UmlBaseComponentView.h | 4 +- .../UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/FileControl/UmlBaseDeployment.h | 4 +- .../FileControl/UmlBaseDeploymentDiagram.h | 4 +- .../FileControl/UmlBaseDeploymentView.h | 4 +- genplugouts/FileControl/UmlBaseDiagram.cpp | 4 +- genplugouts/FileControl/UmlBaseDiagram.h | 6 +- .../UmlBaseEntryPointPseudoState.h | 4 +- .../FileControl/UmlBaseExitPointPseudoState.h | 4 +- .../FileControl/UmlBaseExtraClassMember.cpp | 4 +- .../FileControl/UmlBaseExtraClassMember.h | 8 +- genplugouts/FileControl/UmlBaseFinalState.h | 4 +- .../FileControl/UmlBaseForkPseudoState.h | 4 +- .../FileControl/UmlBaseFormalParameter.h | 10 +- .../FileControl/UmlBaseInitialPseudoState.h | 4 +- genplugouts/FileControl/UmlBaseItem.cpp | 54 +- genplugouts/FileControl/UmlBaseItem.h | 57 +- .../FileControl/UmlBaseJoinPseudoState.h | 4 +- .../FileControl/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/FileControl/UmlBaseNcRelation.h | 6 +- genplugouts/FileControl/UmlBaseNode.h | 4 +- genplugouts/FileControl/UmlBaseOperation.cpp | 30 +- genplugouts/FileControl/UmlBaseOperation.h | 38 +- genplugouts/FileControl/UmlBasePackage.cpp | 44 +- genplugouts/FileControl/UmlBasePackage.h | 56 +- genplugouts/FileControl/UmlBaseRegion.h | 4 +- genplugouts/FileControl/UmlBaseRelation.cpp | 12 +- genplugouts/FileControl/UmlBaseRelation.h | 24 +- .../FileControl/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/FileControl/UmlBaseState.cpp | 20 +- genplugouts/FileControl/UmlBaseState.h | 22 +- .../FileControl/UmlBaseStateAction.cpp | 8 +- genplugouts/FileControl/UmlBaseStateAction.h | 16 +- genplugouts/FileControl/UmlBaseStateDiagram.h | 4 +- .../FileControl/UmlBaseTerminatePseudoState.h | 4 +- genplugouts/FileControl/UmlBaseTransition.cpp | 20 +- genplugouts/FileControl/UmlBaseTransition.h | 22 +- genplugouts/FileControl/UmlBaseUseCase.cpp | 1 + genplugouts/FileControl/UmlBaseUseCase.h | 5 +- .../FileControl/UmlBaseUseCaseDiagram.h | 4 +- genplugouts/FileControl/UmlBaseUseCaseView.h | 4 +- genplugouts/FileControl/UmlBuiltin.h | 18 +- genplugouts/FileControl/UmlClass.h | 4 +- genplugouts/FileControl/UmlClassDiagram.h | 4 +- genplugouts/FileControl/UmlClassItem.h | 4 +- genplugouts/FileControl/UmlClassMember.h | 4 +- genplugouts/FileControl/UmlClassView.h | 4 +- .../FileControl/UmlCollaborationDiagram.h | 4 +- genplugouts/FileControl/UmlCom.cpp | 56 +- genplugouts/FileControl/UmlCom.h | 18 +- genplugouts/FileControl/UmlComponent.h | 4 +- genplugouts/FileControl/UmlComponentDiagram.h | 4 +- genplugouts/FileControl/UmlComponentView.h | 4 +- .../FileControl/UmlDeploymentDiagram.h | 4 +- genplugouts/FileControl/UmlDeploymentView.h | 4 +- genplugouts/FileControl/UmlDiagram.h | 4 +- .../FileControl/UmlEntryPointPseudoState.h | 4 +- .../FileControl/UmlExitPointPseudoState.h | 4 +- genplugouts/FileControl/UmlExtraClassMember.h | 4 +- genplugouts/FileControl/UmlItem.cpp | 6 +- genplugouts/FileControl/UmlItem.h | 8 +- genplugouts/FileControl/UmlNcRelation.h | 4 +- genplugouts/FileControl/UmlNode.h | 4 +- genplugouts/FileControl/UmlOperation.h | 4 +- genplugouts/FileControl/UmlPackage.cpp | 43 +- genplugouts/FileControl/UmlPackage.h | 10 +- genplugouts/FileControl/UmlParameter.h | 6 +- genplugouts/FileControl/UmlPseudoState.h | 4 +- genplugouts/FileControl/UmlRegion.h | 4 +- genplugouts/FileControl/UmlRelation.h | 4 +- genplugouts/FileControl/UmlSequenceDiagram.h | 4 +- genplugouts/FileControl/UmlSettings.cpp | 66 +- genplugouts/FileControl/UmlSettings.h | 55 +- genplugouts/FileControl/UmlState.h | 4 +- genplugouts/FileControl/UmlStateDiagram.h | 4 +- genplugouts/FileControl/UmlStereotype.h | 10 +- genplugouts/FileControl/UmlTransition.h | 4 +- genplugouts/FileControl/UmlTypeSpec.cpp | 4 +- genplugouts/FileControl/UmlTypeSpec.h | 6 +- genplugouts/FileControl/UmlUseCase.h | 4 +- genplugouts/FileControl/UmlUseCaseDiagram.h | 4 +- genplugouts/FileControl/UmlUseCaseView.h | 4 +- genplugouts/FileControl/gridbox.cpp | 37 + genplugouts/FileControl/gridbox.h | 26 + genplugouts/FileControl/hhbox.cpp | 29 + genplugouts/FileControl/hhbox.h | 22 + genplugouts/FileControl/vvbox.cpp | 25 + genplugouts/FileControl/vvbox.h | 22 + genplugouts/GlobalChange/Context.cpp | 24 +- genplugouts/GlobalChange/Context.h | 30 +- genplugouts/GlobalChange/CppSettings.cpp | 248 +- genplugouts/GlobalChange/CppSettings.h | 198 +- genplugouts/GlobalChange/Dialog.cpp | 188 +- genplugouts/GlobalChange/Dialog.h | 4 +- genplugouts/GlobalChange/FlowBehavior.h | 10 +- genplugouts/GlobalChange/GlobalChange.pro | 22 +- genplugouts/GlobalChange/IdlSettings.cpp | 186 +- genplugouts/GlobalChange/IdlSettings.h | 160 +- genplugouts/GlobalChange/JavaSettings.cpp | 150 +- genplugouts/GlobalChange/JavaSettings.h | 124 +- genplugouts/GlobalChange/PhpSettings.cpp | 115 +- genplugouts/GlobalChange/PhpSettings.h | 100 +- genplugouts/GlobalChange/PythonSettings.cpp | 120 +- genplugouts/GlobalChange/PythonSettings.h | 98 +- genplugouts/GlobalChange/SlotAttribute.h | 6 +- genplugouts/GlobalChange/StateBehavior.h | 8 +- genplugouts/GlobalChange/TransitionBehavior.h | 8 +- .../UmlAccessVariableValueAction.h | 4 +- genplugouts/GlobalChange/UmlActivity.h | 4 +- genplugouts/GlobalChange/UmlActivityAction.h | 4 +- .../GlobalChange/UmlActivityActionClasses.h | 30 +- .../GlobalChange/UmlActivityControlNode.h | 4 +- .../UmlActivityControlNodeClasses.h | 16 +- genplugouts/GlobalChange/UmlActivityDiagram.h | 4 +- genplugouts/GlobalChange/UmlActivityNode.h | 4 +- genplugouts/GlobalChange/UmlActivityObject.h | 4 +- .../GlobalChange/UmlActivityParameter.h | 4 +- genplugouts/GlobalChange/UmlActivityPin.h | 4 +- genplugouts/GlobalChange/UmlActivityRegion.h | 4 +- genplugouts/GlobalChange/UmlArtifact.cpp | 14 +- genplugouts/GlobalChange/UmlArtifact.h | 4 +- genplugouts/GlobalChange/UmlAttribute.cpp | 12 +- genplugouts/GlobalChange/UmlAttribute.h | 4 +- .../UmlBaseAccessVariableValueAction.h | 4 +- genplugouts/GlobalChange/UmlBaseActivity.cpp | 14 +- genplugouts/GlobalChange/UmlBaseActivity.h | 28 +- .../GlobalChange/UmlBaseActivityAction.cpp | 14 +- .../GlobalChange/UmlBaseActivityAction.h | 28 +- .../UmlBaseActivityActionClasses.cpp | 20 +- .../UmlBaseActivityActionClasses.h | 66 +- .../GlobalChange/UmlBaseActivityControlNode.h | 4 +- .../UmlBaseActivityControlNodeClasses.h | 16 +- .../GlobalChange/UmlBaseActivityDiagram.h | 4 +- .../GlobalChange/UmlBaseActivityNode.h | 4 +- .../GlobalChange/UmlBaseActivityObject.cpp | 12 +- .../GlobalChange/UmlBaseActivityObject.h | 24 +- .../GlobalChange/UmlBaseActivityParameter.cpp | 4 +- .../GlobalChange/UmlBaseActivityParameter.h | 8 +- genplugouts/GlobalChange/UmlBaseActivityPin.h | 4 +- .../GlobalChange/UmlBaseActivityRegion.h | 4 +- genplugouts/GlobalChange/UmlBaseArtifact.cpp | 56 +- genplugouts/GlobalChange/UmlBaseArtifact.h | 54 +- genplugouts/GlobalChange/UmlBaseAttribute.cpp | 8 +- genplugouts/GlobalChange/UmlBaseAttribute.h | 18 +- .../GlobalChange/UmlBaseChoicePseudoState.h | 4 +- genplugouts/GlobalChange/UmlBaseClass.cpp | 34 +- genplugouts/GlobalChange/UmlBaseClass.h | 25 +- .../GlobalChange/UmlBaseClassDiagram.h | 4 +- .../GlobalChange/UmlBaseClassInstance.cpp | 18 +- .../GlobalChange/UmlBaseClassInstance.h | 16 +- .../UmlBaseClassInstanceReference.cpp | 4 +- .../UmlBaseClassInstanceReference.h | 6 +- genplugouts/GlobalChange/UmlBaseClassItem.cpp | 12 +- genplugouts/GlobalChange/UmlBaseClassItem.h | 24 +- .../GlobalChange/UmlBaseClassMember.cpp | 6 +- genplugouts/GlobalChange/UmlBaseClassMember.h | 12 +- genplugouts/GlobalChange/UmlBaseClassView.h | 4 +- .../UmlBaseCollaborationDiagram.h | 4 +- .../UmlBaseCollaborationDiagramDefinition.cpp | 6 +- .../UmlBaseCollaborationDiagramDefinition.h | 12 +- .../UmlBaseCollaborationMessage.cpp | 2 +- .../UmlBaseCollaborationMessage.h | 10 +- genplugouts/GlobalChange/UmlBaseComponent.cpp | 14 +- genplugouts/GlobalChange/UmlBaseComponent.h | 24 +- .../GlobalChange/UmlBaseComponentDiagram.h | 4 +- .../GlobalChange/UmlBaseComponentView.h | 4 +- .../UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/GlobalChange/UmlBaseDeployment.h | 4 +- .../GlobalChange/UmlBaseDeploymentDiagram.h | 4 +- .../GlobalChange/UmlBaseDeploymentView.h | 4 +- genplugouts/GlobalChange/UmlBaseDiagram.cpp | 4 +- genplugouts/GlobalChange/UmlBaseDiagram.h | 6 +- .../UmlBaseEntryPointPseudoState.h | 4 +- .../UmlBaseExitPointPseudoState.h | 4 +- .../GlobalChange/UmlBaseExpansionNode.h | 4 +- .../GlobalChange/UmlBaseExpansionRegion.h | 4 +- .../GlobalChange/UmlBaseExtraClassMember.cpp | 4 +- .../GlobalChange/UmlBaseExtraClassMember.h | 8 +- genplugouts/GlobalChange/UmlBaseFinalState.h | 4 +- genplugouts/GlobalChange/UmlBaseFlow.cpp | 26 +- genplugouts/GlobalChange/UmlBaseFlow.h | 28 +- .../GlobalChange/UmlBaseForkPseudoState.h | 4 +- .../GlobalChange/UmlBaseFormalParameter.h | 10 +- genplugouts/GlobalChange/UmlBaseFragment.cpp | 8 +- genplugouts/GlobalChange/UmlBaseFragment.h | 31 +- .../UmlBaseFragmentCompartment.cpp | 16 +- .../GlobalChange/UmlBaseFragmentCompartment.h | 24 +- .../GlobalChange/UmlBaseInitialPseudoState.h | 4 +- .../UmlBaseInterruptibleActivityRegion.h | 4 +- genplugouts/GlobalChange/UmlBaseItem.cpp | 54 +- genplugouts/GlobalChange/UmlBaseItem.h | 57 +- .../GlobalChange/UmlBaseJoinPseudoState.h | 4 +- .../GlobalChange/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/GlobalChange/UmlBaseMessage.cpp | 2 +- genplugouts/GlobalChange/UmlBaseMessage.h | 13 +- genplugouts/GlobalChange/UmlBaseNcRelation.h | 6 +- genplugouts/GlobalChange/UmlBaseNode.h | 4 +- .../GlobalChange/UmlBaseObjectDiagram.h | 4 +- .../GlobalChange/UmlBaseOnSignalAction.cpp | 8 +- .../GlobalChange/UmlBaseOnSignalAction.h | 16 +- genplugouts/GlobalChange/UmlBaseOperation.cpp | 44 +- genplugouts/GlobalChange/UmlBaseOperation.h | 58 +- genplugouts/GlobalChange/UmlBasePackage.cpp | 52 +- genplugouts/GlobalChange/UmlBasePackage.h | 76 +- genplugouts/GlobalChange/UmlBaseParameter.h | 6 +- .../GlobalChange/UmlBaseParameterSet.cpp | 8 +- .../GlobalChange/UmlBaseParameterSet.h | 14 +- .../GlobalChange/UmlBasePinParameter.h | 4 +- genplugouts/GlobalChange/UmlBaseRegion.h | 4 +- genplugouts/GlobalChange/UmlBaseRelation.cpp | 12 +- genplugouts/GlobalChange/UmlBaseRelation.h | 24 +- .../GlobalChange/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseSequenceDiagramDefinition.cpp | 14 +- .../UmlBaseSequenceDiagramDefinition.h | 14 +- .../GlobalChange/UmlBaseSequenceMessage.cpp | 2 +- .../GlobalChange/UmlBaseSequenceMessage.h | 12 +- .../UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/GlobalChange/UmlBaseState.cpp | 20 +- genplugouts/GlobalChange/UmlBaseState.h | 22 +- .../GlobalChange/UmlBaseStateAction.cpp | 8 +- genplugouts/GlobalChange/UmlBaseStateAction.h | 16 +- .../GlobalChange/UmlBaseStateDiagram.h | 4 +- genplugouts/GlobalChange/UmlBaseSubject.cpp | 2 +- genplugouts/GlobalChange/UmlBaseSubject.h | 10 +- .../UmlBaseTerminatePseudoState.h | 4 +- .../GlobalChange/UmlBaseTransition.cpp | 20 +- genplugouts/GlobalChange/UmlBaseTransition.h | 22 +- genplugouts/GlobalChange/UmlBaseTypeSpec.cpp | 4 +- genplugouts/GlobalChange/UmlBaseTypeSpec.h | 6 +- genplugouts/GlobalChange/UmlBaseUseCase.cpp | 4 +- genplugouts/GlobalChange/UmlBaseUseCase.h | 8 +- .../UmlBaseUseCaseAssociation.cpp | 2 +- .../GlobalChange/UmlBaseUseCaseAssociation.h | 14 +- .../GlobalChange/UmlBaseUseCaseDiagram.h | 4 +- .../UmlBaseUseCaseDiagramDefinition.cpp | 10 +- .../UmlBaseUseCaseDiagramDefinition.h | 22 +- .../GlobalChange/UmlBaseUseCaseReference.cpp | 2 +- .../GlobalChange/UmlBaseUseCaseReference.h | 4 +- genplugouts/GlobalChange/UmlBaseUseCaseView.h | 4 +- genplugouts/GlobalChange/UmlBaseView.h | 4 +- genplugouts/GlobalChange/UmlBuiltin.h | 19 +- genplugouts/GlobalChange/UmlClass.cpp | 16 +- genplugouts/GlobalChange/UmlClass.h | 4 +- genplugouts/GlobalChange/UmlClassDiagram.h | 4 +- genplugouts/GlobalChange/UmlClassInstance.h | 4 +- genplugouts/GlobalChange/UmlClassItem.h | 4 +- genplugouts/GlobalChange/UmlClassMember.h | 4 +- genplugouts/GlobalChange/UmlClassView.cpp | 3 +- genplugouts/GlobalChange/UmlClassView.h | 4 +- .../GlobalChange/UmlCollaborationDiagram.h | 4 +- genplugouts/GlobalChange/UmlCom.cpp | 36 +- genplugouts/GlobalChange/UmlCom.h | 18 +- genplugouts/GlobalChange/UmlComponent.h | 4 +- .../GlobalChange/UmlComponentDiagram.h | 4 +- genplugouts/GlobalChange/UmlComponentView.h | 4 +- .../GlobalChange/UmlDeploymentDiagram.h | 4 +- .../GlobalChange/UmlDeploymentView.cpp | 3 +- genplugouts/GlobalChange/UmlDeploymentView.h | 4 +- genplugouts/GlobalChange/UmlDiagram.h | 4 +- .../GlobalChange/UmlEntryPointPseudoState.h | 4 +- .../GlobalChange/UmlExitPointPseudoState.h | 4 +- genplugouts/GlobalChange/UmlExpansionNode.h | 4 +- genplugouts/GlobalChange/UmlExpansionRegion.h | 4 +- .../GlobalChange/UmlExtraClassMember.h | 4 +- genplugouts/GlobalChange/UmlFlow.h | 4 +- .../UmlInterruptibleActivityRegion.h | 4 +- genplugouts/GlobalChange/UmlItem.h | 4 +- genplugouts/GlobalChange/UmlNcRelation.h | 4 +- genplugouts/GlobalChange/UmlNode.h | 4 +- genplugouts/GlobalChange/UmlObjectDiagram.h | 4 +- genplugouts/GlobalChange/UmlOnSignalAction.h | 4 +- genplugouts/GlobalChange/UmlOperation.cpp | 14 +- genplugouts/GlobalChange/UmlOperation.h | 4 +- genplugouts/GlobalChange/UmlPackage.cpp | 4 +- genplugouts/GlobalChange/UmlPackage.h | 4 +- genplugouts/GlobalChange/UmlParameterSet.h | 4 +- genplugouts/GlobalChange/UmlPinParameter.h | 4 +- genplugouts/GlobalChange/UmlPseudoState.h | 4 +- genplugouts/GlobalChange/UmlRegion.h | 4 +- genplugouts/GlobalChange/UmlRelation.cpp | 12 +- genplugouts/GlobalChange/UmlRelation.h | 4 +- genplugouts/GlobalChange/UmlSequenceDiagram.h | 4 +- genplugouts/GlobalChange/UmlSettings.cpp | 72 +- genplugouts/GlobalChange/UmlSettings.h | 55 +- genplugouts/GlobalChange/UmlState.h | 4 +- genplugouts/GlobalChange/UmlStateDiagram.h | 4 +- genplugouts/GlobalChange/UmlStereotype.h | 14 +- genplugouts/GlobalChange/UmlTransition.h | 4 +- genplugouts/GlobalChange/UmlUseCase.h | 4 +- genplugouts/GlobalChange/UmlUseCaseDiagram.h | 4 +- genplugouts/GlobalChange/UmlUseCaseView.h | 4 +- genplugouts/GlobalChange/UmlView.h | 4 +- genplugouts/GlobalChange/bbuttongroup.cpp | 65 + genplugouts/GlobalChange/bbuttongroup.h | 26 + genplugouts/GlobalChange/gridbox.cpp | 37 + genplugouts/GlobalChange/gridbox.h | 26 + genplugouts/GlobalChange/hhbox.cpp | 29 + genplugouts/GlobalChange/hhbox.h | 22 + genplugouts/GlobalChange/vgridbox.cpp | 37 + genplugouts/GlobalChange/vgridbox.h | 26 + genplugouts/GlobalChange/vvbox.cpp | 25 + genplugouts/GlobalChange/vvbox.h | 22 + genplugouts/HtmlDoc/CppSettings.cpp | 266 +- genplugouts/HtmlDoc/CppSettings.h | 216 +- genplugouts/HtmlDoc/FileWriter.cpp | 24 +- genplugouts/HtmlDoc/FileWriter.h | 13 +- genplugouts/HtmlDoc/FlowBehavior.h | 10 +- genplugouts/HtmlDoc/HtmlDoc.pro | 9 +- genplugouts/HtmlDoc/IdlSettings.cpp | 186 +- genplugouts/HtmlDoc/IdlSettings.h | 160 +- genplugouts/HtmlDoc/JavaSettings.cpp | 162 +- genplugouts/HtmlDoc/JavaSettings.h | 136 +- genplugouts/HtmlDoc/Main.cpp | 25 +- genplugouts/HtmlDoc/PhpSettings.cpp | 102 +- genplugouts/HtmlDoc/PhpSettings.h | 98 +- genplugouts/HtmlDoc/PythonSettings.cpp | 126 +- genplugouts/HtmlDoc/PythonSettings.h | 104 +- genplugouts/HtmlDoc/SlotAttribute.h | 6 +- genplugouts/HtmlDoc/StateBehavior.h | 8 +- genplugouts/HtmlDoc/TransitionBehavior.h | 8 +- .../HtmlDoc/UmlAccessVariableValueAction.cpp | 4 +- .../HtmlDoc/UmlAccessVariableValueAction.h | 6 +- genplugouts/HtmlDoc/UmlActivity.cpp | 10 +- genplugouts/HtmlDoc/UmlActivity.h | 8 +- genplugouts/HtmlDoc/UmlActivityAction.cpp | 8 +- genplugouts/HtmlDoc/UmlActivityAction.h | 4 +- .../HtmlDoc/UmlActivityActionClasses.cpp | 106 +- .../HtmlDoc/UmlActivityActionClasses.h | 118 +- .../HtmlDoc/UmlActivityControlNode.cpp | 8 +- genplugouts/HtmlDoc/UmlActivityControlNode.h | 6 +- .../HtmlDoc/UmlActivityControlNodeClasses.cpp | 16 +- .../HtmlDoc/UmlActivityControlNodeClasses.h | 30 +- genplugouts/HtmlDoc/UmlActivityDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlActivityDiagram.h | 6 +- genplugouts/HtmlDoc/UmlActivityNode.h | 4 +- genplugouts/HtmlDoc/UmlActivityObject.cpp | 14 +- genplugouts/HtmlDoc/UmlActivityObject.h | 10 +- genplugouts/HtmlDoc/UmlActivityParameter.cpp | 8 +- genplugouts/HtmlDoc/UmlActivityParameter.h | 8 +- genplugouts/HtmlDoc/UmlActivityPartition.cpp | 8 +- genplugouts/HtmlDoc/UmlActivityPartition.h | 8 +- genplugouts/HtmlDoc/UmlActivityPin.cpp | 6 +- genplugouts/HtmlDoc/UmlActivityPin.h | 8 +- genplugouts/HtmlDoc/UmlActivityRegion.h | 4 +- genplugouts/HtmlDoc/UmlArtifact.cpp | 10 +- genplugouts/HtmlDoc/UmlArtifact.h | 8 +- genplugouts/HtmlDoc/UmlAttribute.cpp | 28 +- genplugouts/HtmlDoc/UmlAttribute.h | 16 +- .../UmlBaseAccessVariableValueAction.h | 4 +- genplugouts/HtmlDoc/UmlBaseActivity.cpp | 16 +- genplugouts/HtmlDoc/UmlBaseActivity.h | 32 +- genplugouts/HtmlDoc/UmlBaseActivityAction.cpp | 16 +- genplugouts/HtmlDoc/UmlBaseActivityAction.h | 32 +- .../HtmlDoc/UmlBaseActivityActionClasses.cpp | 34 +- .../HtmlDoc/UmlBaseActivityActionClasses.h | 108 +- .../HtmlDoc/UmlBaseActivityControlNode.h | 4 +- .../UmlBaseActivityControlNodeClasses.h | 16 +- genplugouts/HtmlDoc/UmlBaseActivityDiagram.h | 4 +- genplugouts/HtmlDoc/UmlBaseActivityNode.h | 4 +- genplugouts/HtmlDoc/UmlBaseActivityObject.cpp | 12 +- genplugouts/HtmlDoc/UmlBaseActivityObject.h | 24 +- .../HtmlDoc/UmlBaseActivityParameter.cpp | 4 +- .../HtmlDoc/UmlBaseActivityParameter.h | 8 +- .../HtmlDoc/UmlBaseActivityPartition.h | 4 +- genplugouts/HtmlDoc/UmlBaseActivityPin.h | 4 +- genplugouts/HtmlDoc/UmlBaseActivityRegion.h | 4 +- genplugouts/HtmlDoc/UmlBaseArtifact.cpp | 57 +- genplugouts/HtmlDoc/UmlBaseArtifact.h | 54 +- genplugouts/HtmlDoc/UmlBaseAttribute.cpp | 8 +- genplugouts/HtmlDoc/UmlBaseAttribute.h | 18 +- .../HtmlDoc/UmlBaseChoicePseudoState.h | 4 +- genplugouts/HtmlDoc/UmlBaseClass.cpp | 34 +- genplugouts/HtmlDoc/UmlBaseClass.h | 24 +- genplugouts/HtmlDoc/UmlBaseClassDiagram.h | 4 +- genplugouts/HtmlDoc/UmlBaseClassInstance.cpp | 18 +- genplugouts/HtmlDoc/UmlBaseClassInstance.h | 16 +- .../HtmlDoc/UmlBaseClassInstanceReference.cpp | 4 +- .../HtmlDoc/UmlBaseClassInstanceReference.h | 6 +- genplugouts/HtmlDoc/UmlBaseClassItem.cpp | 12 +- genplugouts/HtmlDoc/UmlBaseClassItem.h | 24 +- genplugouts/HtmlDoc/UmlBaseClassMember.cpp | 6 +- genplugouts/HtmlDoc/UmlBaseClassMember.h | 12 +- genplugouts/HtmlDoc/UmlBaseClassView.h | 4 +- .../HtmlDoc/UmlBaseCollaborationDiagram.h | 4 +- .../UmlBaseCollaborationDiagramDefinition.cpp | 6 +- .../UmlBaseCollaborationDiagramDefinition.h | 12 +- .../HtmlDoc/UmlBaseCollaborationMessage.cpp | 2 +- .../HtmlDoc/UmlBaseCollaborationMessage.h | 10 +- genplugouts/HtmlDoc/UmlBaseComponent.cpp | 12 +- genplugouts/HtmlDoc/UmlBaseComponent.h | 22 +- genplugouts/HtmlDoc/UmlBaseComponentDiagram.h | 4 +- genplugouts/HtmlDoc/UmlBaseComponentView.h | 4 +- .../HtmlDoc/UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlBaseDeployment.h | 4 +- .../HtmlDoc/UmlBaseDeploymentDiagram.h | 4 +- genplugouts/HtmlDoc/UmlBaseDeploymentView.h | 4 +- genplugouts/HtmlDoc/UmlBaseDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlBaseDiagram.h | 6 +- .../HtmlDoc/UmlBaseEntryPointPseudoState.h | 4 +- .../HtmlDoc/UmlBaseExitPointPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlBaseExpansionNode.h | 4 +- genplugouts/HtmlDoc/UmlBaseExpansionRegion.h | 4 +- .../HtmlDoc/UmlBaseExtraClassMember.cpp | 4 +- genplugouts/HtmlDoc/UmlBaseExtraClassMember.h | 8 +- genplugouts/HtmlDoc/UmlBaseFinalState.h | 4 +- genplugouts/HtmlDoc/UmlBaseFlow.cpp | 26 +- genplugouts/HtmlDoc/UmlBaseFlow.h | 28 +- genplugouts/HtmlDoc/UmlBaseForkPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlBaseFormalParameter.h | 10 +- genplugouts/HtmlDoc/UmlBaseFragment.cpp | 8 +- genplugouts/HtmlDoc/UmlBaseFragment.h | 28 +- .../HtmlDoc/UmlBaseFragmentCompartment.cpp | 16 +- .../HtmlDoc/UmlBaseFragmentCompartment.h | 24 +- .../HtmlDoc/UmlBaseInitialPseudoState.h | 4 +- .../UmlBaseInterruptibleActivityRegion.h | 4 +- genplugouts/HtmlDoc/UmlBaseItem.cpp | 61 +- genplugouts/HtmlDoc/UmlBaseItem.h | 57 +- genplugouts/HtmlDoc/UmlBaseJoinPseudoState.h | 4 +- .../HtmlDoc/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlBaseMessage.cpp | 2 +- genplugouts/HtmlDoc/UmlBaseMessage.h | 11 +- genplugouts/HtmlDoc/UmlBaseNcRelation.h | 6 +- genplugouts/HtmlDoc/UmlBaseNode.h | 4 +- genplugouts/HtmlDoc/UmlBaseObjectDiagram.h | 4 +- genplugouts/HtmlDoc/UmlBaseOnSignalAction.cpp | 8 +- genplugouts/HtmlDoc/UmlBaseOnSignalAction.h | 16 +- genplugouts/HtmlDoc/UmlBaseOperation.cpp | 48 +- genplugouts/HtmlDoc/UmlBaseOperation.h | 62 +- genplugouts/HtmlDoc/UmlBasePackage.cpp | 60 +- genplugouts/HtmlDoc/UmlBasePackage.h | 86 +- genplugouts/HtmlDoc/UmlBaseParameter.h | 6 +- genplugouts/HtmlDoc/UmlBaseParameterSet.cpp | 8 +- genplugouts/HtmlDoc/UmlBaseParameterSet.h | 14 +- genplugouts/HtmlDoc/UmlBasePinParameter.h | 4 +- genplugouts/HtmlDoc/UmlBaseRegion.h | 4 +- genplugouts/HtmlDoc/UmlBaseRelation.cpp | 12 +- genplugouts/HtmlDoc/UmlBaseRelation.h | 24 +- genplugouts/HtmlDoc/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseSequenceDiagramDefinition.cpp | 14 +- .../UmlBaseSequenceDiagramDefinition.h | 14 +- .../HtmlDoc/UmlBaseSequenceMessage.cpp | 2 +- genplugouts/HtmlDoc/UmlBaseSequenceMessage.h | 16 +- .../UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlBaseState.cpp | 20 +- genplugouts/HtmlDoc/UmlBaseState.h | 22 +- genplugouts/HtmlDoc/UmlBaseStateAction.cpp | 8 +- genplugouts/HtmlDoc/UmlBaseStateAction.h | 16 +- genplugouts/HtmlDoc/UmlBaseStateDiagram.h | 4 +- genplugouts/HtmlDoc/UmlBaseSubject.cpp | 2 +- genplugouts/HtmlDoc/UmlBaseSubject.h | 10 +- .../HtmlDoc/UmlBaseTerminatePseudoState.h | 4 +- genplugouts/HtmlDoc/UmlBaseTransition.cpp | 20 +- genplugouts/HtmlDoc/UmlBaseTransition.h | 22 +- genplugouts/HtmlDoc/UmlBaseTypeSpec.cpp | 4 +- genplugouts/HtmlDoc/UmlBaseTypeSpec.h | 6 +- genplugouts/HtmlDoc/UmlBaseUseCase.cpp | 4 +- genplugouts/HtmlDoc/UmlBaseUseCase.h | 8 +- .../HtmlDoc/UmlBaseUseCaseAssociation.cpp | 2 +- .../HtmlDoc/UmlBaseUseCaseAssociation.h | 15 +- genplugouts/HtmlDoc/UmlBaseUseCaseDiagram.h | 4 +- .../UmlBaseUseCaseDiagramDefinition.cpp | 10 +- .../HtmlDoc/UmlBaseUseCaseDiagramDefinition.h | 22 +- .../HtmlDoc/UmlBaseUseCaseReference.cpp | 2 +- genplugouts/HtmlDoc/UmlBaseUseCaseReference.h | 4 +- genplugouts/HtmlDoc/UmlBaseUseCaseView.h | 4 +- genplugouts/HtmlDoc/UmlBaseView.h | 4 +- genplugouts/HtmlDoc/UmlBuiltin.h | 19 +- genplugouts/HtmlDoc/UmlChoicePseudoState.cpp | 4 +- genplugouts/HtmlDoc/UmlChoicePseudoState.h | 4 +- genplugouts/HtmlDoc/UmlClass.cpp | 71 +- genplugouts/HtmlDoc/UmlClass.h | 26 +- genplugouts/HtmlDoc/UmlClassDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlClassDiagram.h | 6 +- genplugouts/HtmlDoc/UmlClassInstance.cpp | 18 +- genplugouts/HtmlDoc/UmlClassInstance.h | 8 +- genplugouts/HtmlDoc/UmlClassItem.h | 4 +- genplugouts/HtmlDoc/UmlClassMember.h | 4 +- genplugouts/HtmlDoc/UmlClassView.cpp | 6 +- genplugouts/HtmlDoc/UmlClassView.h | 8 +- .../HtmlDoc/UmlCollaborationDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlCollaborationDiagram.h | 6 +- genplugouts/HtmlDoc/UmlCom.cpp | 43 +- genplugouts/HtmlDoc/UmlCom.h | 17 +- genplugouts/HtmlDoc/UmlComponent.cpp | 12 +- genplugouts/HtmlDoc/UmlComponent.h | 8 +- genplugouts/HtmlDoc/UmlComponentDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlComponentDiagram.h | 6 +- genplugouts/HtmlDoc/UmlComponentView.cpp | 6 +- genplugouts/HtmlDoc/UmlComponentView.h | 8 +- .../HtmlDoc/UmlDeepHistoryPseudoState.cpp | 4 +- .../HtmlDoc/UmlDeepHistoryPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlDeploymentDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlDeploymentDiagram.h | 6 +- genplugouts/HtmlDoc/UmlDeploymentView.cpp | 6 +- genplugouts/HtmlDoc/UmlDeploymentView.h | 8 +- genplugouts/HtmlDoc/UmlDiagram.cpp | 6 +- genplugouts/HtmlDoc/UmlDiagram.h | 6 +- .../HtmlDoc/UmlEntryPointPseudoState.cpp | 10 +- .../HtmlDoc/UmlEntryPointPseudoState.h | 8 +- .../HtmlDoc/UmlExitPointPseudoState.cpp | 10 +- genplugouts/HtmlDoc/UmlExitPointPseudoState.h | 8 +- genplugouts/HtmlDoc/UmlExpansionNode.h | 4 +- genplugouts/HtmlDoc/UmlExpansionRegion.cpp | 6 +- genplugouts/HtmlDoc/UmlExpansionRegion.h | 8 +- genplugouts/HtmlDoc/UmlExtraClassMember.cpp | 8 +- genplugouts/HtmlDoc/UmlExtraClassMember.h | 8 +- genplugouts/HtmlDoc/UmlFinalState.cpp | 4 +- genplugouts/HtmlDoc/UmlFinalState.h | 4 +- genplugouts/HtmlDoc/UmlFlow.cpp | 10 +- genplugouts/HtmlDoc/UmlFlow.h | 8 +- genplugouts/HtmlDoc/UmlForkPseudoState.cpp | 4 +- genplugouts/HtmlDoc/UmlForkPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlInitialPseudoState.cpp | 4 +- genplugouts/HtmlDoc/UmlInitialPseudoState.h | 4 +- .../UmlInterruptibleActivityRegion.cpp | 6 +- .../HtmlDoc/UmlInterruptibleActivityRegion.h | 8 +- genplugouts/HtmlDoc/UmlItem.cpp | 80 +- genplugouts/HtmlDoc/UmlItem.h | 30 +- genplugouts/HtmlDoc/UmlJoinPseudoState.cpp | 4 +- genplugouts/HtmlDoc/UmlJoinPseudoState.h | 4 +- .../HtmlDoc/UmlJunctionPseudoState.cpp | 4 +- genplugouts/HtmlDoc/UmlJunctionPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlNcRelation.cpp | 6 +- genplugouts/HtmlDoc/UmlNcRelation.h | 8 +- genplugouts/HtmlDoc/UmlNode.cpp | 6 +- genplugouts/HtmlDoc/UmlNode.h | 8 +- genplugouts/HtmlDoc/UmlObjectDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlObjectDiagram.h | 6 +- genplugouts/HtmlDoc/UmlOnSignalAction.cpp | 10 +- genplugouts/HtmlDoc/UmlOnSignalAction.h | 6 +- genplugouts/HtmlDoc/UmlOperation.cpp | 54 +- genplugouts/HtmlDoc/UmlOperation.h | 18 +- genplugouts/HtmlDoc/UmlPackage.cpp | 8 +- genplugouts/HtmlDoc/UmlPackage.h | 8 +- genplugouts/HtmlDoc/UmlParameterSet.cpp | 10 +- genplugouts/HtmlDoc/UmlParameterSet.h | 8 +- genplugouts/HtmlDoc/UmlPinParameter.cpp | 4 +- genplugouts/HtmlDoc/UmlPinParameter.h | 6 +- genplugouts/HtmlDoc/UmlPseudoState.cpp | 8 +- genplugouts/HtmlDoc/UmlPseudoState.h | 6 +- genplugouts/HtmlDoc/UmlRegion.cpp | 6 +- genplugouts/HtmlDoc/UmlRegion.h | 8 +- genplugouts/HtmlDoc/UmlRelation.cpp | 26 +- genplugouts/HtmlDoc/UmlRelation.h | 18 +- genplugouts/HtmlDoc/UmlSequenceDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlSequenceDiagram.h | 6 +- genplugouts/HtmlDoc/UmlSettings.cpp | 72 +- genplugouts/HtmlDoc/UmlSettings.h | 56 +- .../HtmlDoc/UmlShallowHistoryPseudoState.cpp | 4 +- .../HtmlDoc/UmlShallowHistoryPseudoState.h | 4 +- genplugouts/HtmlDoc/UmlState.cpp | 10 +- genplugouts/HtmlDoc/UmlState.h | 8 +- genplugouts/HtmlDoc/UmlStateAction.cpp | 12 +- genplugouts/HtmlDoc/UmlStateAction.h | 6 +- genplugouts/HtmlDoc/UmlStateDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlStateDiagram.h | 6 +- genplugouts/HtmlDoc/UmlStereotype.h | 14 +- .../HtmlDoc/UmlTerminatePseudoState.cpp | 4 +- genplugouts/HtmlDoc/UmlTerminatePseudoState.h | 4 +- genplugouts/HtmlDoc/UmlTransition.cpp | 10 +- genplugouts/HtmlDoc/UmlTransition.h | 8 +- genplugouts/HtmlDoc/UmlUseCase.cpp | 8 +- genplugouts/HtmlDoc/UmlUseCase.h | 8 +- genplugouts/HtmlDoc/UmlUseCaseDiagram.cpp | 4 +- genplugouts/HtmlDoc/UmlUseCaseDiagram.h | 6 +- genplugouts/HtmlDoc/UmlUseCaseView.cpp | 6 +- genplugouts/HtmlDoc/UmlUseCaseView.h | 8 +- genplugouts/HtmlDoc/UmlView.h | 4 +- genplugouts/HtmlDoc/Vector.cpp | 6 +- genplugouts/HtmlDoc/Vector.h | 8 +- genplugouts/Xmi2Generator/CppSettings.cpp | 32 +- genplugouts/Xmi2Generator/CppSettings.h | 4 +- genplugouts/Xmi2Generator/Dialog.cpp | 134 +- genplugouts/Xmi2Generator/FileOut.cpp | 46 +- genplugouts/Xmi2Generator/FileOut.h | 4 +- genplugouts/Xmi2Generator/FlowContainer.cpp | 2 +- genplugouts/Xmi2Generator/FlowContainer.h | 4 +- genplugouts/Xmi2Generator/IdlSettings.cpp | 16 +- genplugouts/Xmi2Generator/IdlSettings.h | 4 +- genplugouts/Xmi2Generator/JavaSettings.cpp | 16 +- genplugouts/Xmi2Generator/JavaSettings.h | 4 +- genplugouts/Xmi2Generator/Main.cpp | 20 +- genplugouts/Xmi2Generator/PhpSettings.cpp | 4 +- genplugouts/Xmi2Generator/PythonSettings.cpp | 12 +- genplugouts/Xmi2Generator/PythonSettings.h | 4 +- genplugouts/Xmi2Generator/SlotAttribute.h | 2 +- genplugouts/Xmi2Generator/UmlActivity.cpp | 10 +- .../Xmi2Generator/UmlActivityAction.cpp | 4 +- .../Xmi2Generator/UmlActivityControlNode.cpp | 2 +- .../UmlActivityControlNodeClasses.cpp | 78 +- genplugouts/Xmi2Generator/UmlActivityNode.cpp | 8 +- genplugouts/Xmi2Generator/UmlActivityNode.h | 4 +- .../Xmi2Generator/UmlActivityObject.cpp | 12 +- .../Xmi2Generator/UmlActivityParameter.cpp | 2 +- .../Xmi2Generator/UmlActivityPartition.cpp | 2 +- genplugouts/Xmi2Generator/UmlActivityPin.cpp | 2 +- .../Xmi2Generator/UmlActivityRegion.cpp | 2 +- genplugouts/Xmi2Generator/UmlArtifact.cpp | 6 +- genplugouts/Xmi2Generator/UmlBaseArtifact.cpp | 30 +- genplugouts/Xmi2Generator/UmlBaseArtifact.h | 12 +- genplugouts/Xmi2Generator/UmlBaseClass.cpp | 22 +- genplugouts/Xmi2Generator/UmlBaseClass.h | 15 +- .../Xmi2Generator/UmlBaseClassInstance.cpp | 18 +- .../Xmi2Generator/UmlBaseClassInstance.h | 12 +- .../UmlBaseClassInstanceReference.h | 2 +- .../UmlBaseCollaborationDiagramDefinition.cpp | 6 +- .../UmlBaseCollaborationDiagramDefinition.h | 12 +- .../UmlBaseCollaborationMessage.cpp | 2 +- .../UmlBaseCollaborationMessage.h | 4 +- .../Xmi2Generator/UmlBaseComponent.cpp | 14 +- genplugouts/Xmi2Generator/UmlBaseComponent.h | 18 +- genplugouts/Xmi2Generator/UmlBaseFragment.cpp | 8 +- genplugouts/Xmi2Generator/UmlBaseFragment.h | 20 +- .../UmlBaseFragmentCompartment.cpp | 10 +- .../UmlBaseFragmentCompartment.h | 10 +- genplugouts/Xmi2Generator/UmlBaseItem.cpp | 20 +- genplugouts/Xmi2Generator/UmlBaseItem.h | 23 +- genplugouts/Xmi2Generator/UmlBaseMessage.cpp | 2 +- genplugouts/Xmi2Generator/UmlBaseMessage.h | 5 +- .../Xmi2Generator/UmlBaseOperation.cpp | 18 +- genplugouts/Xmi2Generator/UmlBaseOperation.h | 14 +- .../Xmi2Generator/UmlBaseParameterSet.cpp | 8 +- .../Xmi2Generator/UmlBaseParameterSet.h | 10 +- .../UmlBaseSequenceDiagramDefinition.cpp | 8 +- .../UmlBaseSequenceDiagramDefinition.h | 14 +- .../Xmi2Generator/UmlBaseSequenceMessage.cpp | 2 +- .../Xmi2Generator/UmlBaseSequenceMessage.h | 6 +- genplugouts/Xmi2Generator/UmlBaseSubject.cpp | 2 +- genplugouts/Xmi2Generator/UmlBaseSubject.h | 6 +- genplugouts/Xmi2Generator/UmlBaseTypeSpec.h | 2 +- .../UmlBaseUseCaseAssociation.cpp | 2 +- .../Xmi2Generator/UmlBaseUseCaseAssociation.h | 6 +- .../UmlBaseUseCaseDiagramDefinition.cpp | 10 +- .../UmlBaseUseCaseDiagramDefinition.h | 22 +- .../Xmi2Generator/UmlBaseUseCaseReference.cpp | 2 +- .../Xmi2Generator/UmlBaseUseCaseReference.h | 4 +- genplugouts/Xmi2Generator/UmlBuiltin.h | 1 + genplugouts/Xmi2Generator/UmlClass.cpp | 18 +- genplugouts/Xmi2Generator/UmlClass.h | 4 +- .../Xmi2Generator/UmlClassInstance.cpp | 10 +- .../UmlClassInstanceReference.cpp | 4 +- .../Xmi2Generator/UmlClassInstanceReference.h | 6 +- genplugouts/Xmi2Generator/UmlClassMember.cpp | 4 +- genplugouts/Xmi2Generator/UmlClassView.cpp | 6 +- genplugouts/Xmi2Generator/UmlClassView.h | 4 +- .../UmlCollaborationDiagramDefinition.cpp | 2 +- .../Xmi2Generator/UmlCollaborationMessage.cpp | 2 +- .../Xmi2Generator/UmlCollaborationMessage.h | 4 +- genplugouts/Xmi2Generator/UmlCom.cpp | 32 +- genplugouts/Xmi2Generator/UmlCom.h | 14 +- genplugouts/Xmi2Generator/UmlComponent.cpp | 8 +- .../Xmi2Generator/UmlComponentView.cpp | 4 +- genplugouts/Xmi2Generator/UmlComponentView.h | 4 +- .../Xmi2Generator/UmlDeploymentView.cpp | 4 +- genplugouts/Xmi2Generator/UmlDeploymentView.h | 4 +- .../UmlEntryPointPseudoState.cpp | 4 +- .../Xmi2Generator/UmlExitPointPseudoState.cpp | 4 +- .../Xmi2Generator/UmlExpansionNode.cpp | 2 +- .../Xmi2Generator/UmlExpansionRegion.cpp | 2 +- genplugouts/Xmi2Generator/UmlFinalState.cpp | 2 +- genplugouts/Xmi2Generator/UmlFragment.cpp | 25 +- genplugouts/Xmi2Generator/UmlFragment.h | 8 +- .../Xmi2Generator/UmlFragmentCompartment.cpp | 18 +- .../Xmi2Generator/UmlFragmentCompartment.h | 8 +- .../UmlInterruptibleActivityRegion.cpp | 2 +- genplugouts/Xmi2Generator/UmlItem.cpp | 49 +- genplugouts/Xmi2Generator/UmlItem.h | 4 +- genplugouts/Xmi2Generator/UmlMessage.cpp | 11 +- genplugouts/Xmi2Generator/UmlMessage.h | 4 +- genplugouts/Xmi2Generator/UmlNode.cpp | 2 +- genplugouts/Xmi2Generator/UmlOperation.cpp | 52 +- genplugouts/Xmi2Generator/UmlOperation.h | 7 +- genplugouts/Xmi2Generator/UmlPackage.cpp | 18 +- genplugouts/Xmi2Generator/UmlPackage.h | 8 +- genplugouts/Xmi2Generator/UmlPinParameter.cpp | 2 +- genplugouts/Xmi2Generator/UmlPseudoState.cpp | 6 +- genplugouts/Xmi2Generator/UmlPseudoState.h | 4 +- genplugouts/Xmi2Generator/UmlRegion.cpp | 4 +- genplugouts/Xmi2Generator/UmlRegion.h | 4 +- .../UmlSequenceDiagramDefinition.cpp | 2 +- .../Xmi2Generator/UmlSequenceMessage.cpp | 40 +- .../Xmi2Generator/UmlSequenceMessage.h | 12 +- genplugouts/Xmi2Generator/UmlSettings.cpp | 24 +- genplugouts/Xmi2Generator/UmlSettings.h | 12 +- genplugouts/Xmi2Generator/UmlState.cpp | 8 +- genplugouts/Xmi2Generator/UmlState.h | 8 +- genplugouts/Xmi2Generator/UmlStateAction.cpp | 2 +- genplugouts/Xmi2Generator/UmlStateAction.h | 4 +- genplugouts/Xmi2Generator/UmlStereotype.h | 2 +- genplugouts/Xmi2Generator/UmlUseCase.cpp | 2 +- .../Xmi2Generator/UmlUseCaseDiagram.cpp | 2 +- genplugouts/Xmi2Generator/UmlUseCaseView.cpp | 6 +- genplugouts/Xmi2Generator/UmlUseCaseView.h | 6 +- genplugouts/Xmi2Generator/Xmi2Generator.pro | 19 +- genplugouts/Xmi2Generator/bbuttongroup.cpp | 65 + genplugouts/Xmi2Generator/bbuttongroup.h | 26 + genplugouts/Xmi2Generator/gridbox.cpp | 37 + genplugouts/Xmi2Generator/gridbox.h | 26 + genplugouts/Xmi2Generator/hhbox.cpp | 29 + genplugouts/Xmi2Generator/hhbox.h | 22 + genplugouts/deploy/CppSettings.cpp | 248 +- genplugouts/deploy/CppSettings.h | 198 +- genplugouts/deploy/FlowBehavior.h | 10 +- genplugouts/deploy/IdlSettings.cpp | 186 +- genplugouts/deploy/IdlSettings.h | 160 +- genplugouts/deploy/JavaSettings.cpp | 150 +- genplugouts/deploy/JavaSettings.h | 124 +- genplugouts/deploy/Main.cpp | 2 +- genplugouts/deploy/PhpSettings.cpp | 115 +- genplugouts/deploy/PhpSettings.h | 102 +- genplugouts/deploy/PythonSettings.cpp | 120 +- genplugouts/deploy/PythonSettings.h | 98 +- genplugouts/deploy/SlotAttribute.h | 9 +- genplugouts/deploy/StateBehavior.h | 8 +- genplugouts/deploy/TransitionBehavior.h | 8 +- .../deploy/UmlAccessVariableValueAction.h | 4 +- genplugouts/deploy/UmlActivity.h | 4 +- genplugouts/deploy/UmlActivityAction.h | 4 +- genplugouts/deploy/UmlActivityActionClasses.h | 30 +- genplugouts/deploy/UmlActivityControlNode.h | 4 +- .../deploy/UmlActivityControlNodeClasses.h | 16 +- genplugouts/deploy/UmlActivityDiagram.h | 4 +- genplugouts/deploy/UmlActivityNode.h | 4 +- genplugouts/deploy/UmlActivityObject.h | 4 +- genplugouts/deploy/UmlActivityParameter.h | 4 +- genplugouts/deploy/UmlActivityPin.h | 4 +- genplugouts/deploy/UmlActivityRegion.h | 4 +- genplugouts/deploy/UmlArtifact.h | 4 +- genplugouts/deploy/UmlAttribute.h | 4 +- .../deploy/UmlBaseAccessVariableValueAction.h | 4 +- genplugouts/deploy/UmlBaseActivity.cpp | 14 +- genplugouts/deploy/UmlBaseActivity.h | 28 +- genplugouts/deploy/UmlBaseActivityAction.cpp | 14 +- genplugouts/deploy/UmlBaseActivityAction.h | 28 +- .../deploy/UmlBaseActivityActionClasses.cpp | 20 +- .../deploy/UmlBaseActivityActionClasses.h | 66 +- .../deploy/UmlBaseActivityControlNode.h | 4 +- .../UmlBaseActivityControlNodeClasses.h | 16 +- genplugouts/deploy/UmlBaseActivityDiagram.h | 4 +- genplugouts/deploy/UmlBaseActivityNode.h | 4 +- genplugouts/deploy/UmlBaseActivityObject.cpp | 12 +- genplugouts/deploy/UmlBaseActivityObject.h | 24 +- .../deploy/UmlBaseActivityParameter.cpp | 4 +- genplugouts/deploy/UmlBaseActivityParameter.h | 8 +- genplugouts/deploy/UmlBaseActivityPin.h | 4 +- genplugouts/deploy/UmlBaseActivityRegion.h | 4 +- genplugouts/deploy/UmlBaseArtifact.cpp | 56 +- genplugouts/deploy/UmlBaseArtifact.h | 54 +- genplugouts/deploy/UmlBaseAttribute.cpp | 8 +- genplugouts/deploy/UmlBaseAttribute.h | 18 +- genplugouts/deploy/UmlBaseChoicePseudoState.h | 4 +- genplugouts/deploy/UmlBaseClass.cpp | 34 +- genplugouts/deploy/UmlBaseClass.h | 24 +- genplugouts/deploy/UmlBaseClassDiagram.h | 4 +- genplugouts/deploy/UmlBaseClassInstance.cpp | 19 +- genplugouts/deploy/UmlBaseClassInstance.h | 16 +- .../deploy/UmlBaseClassInstanceReference.cpp | 4 +- .../deploy/UmlBaseClassInstanceReference.h | 9 +- genplugouts/deploy/UmlBaseClassItem.cpp | 12 +- genplugouts/deploy/UmlBaseClassItem.h | 24 +- genplugouts/deploy/UmlBaseClassMember.cpp | 6 +- genplugouts/deploy/UmlBaseClassMember.h | 12 +- genplugouts/deploy/UmlBaseClassView.h | 4 +- .../deploy/UmlBaseCollaborationDiagram.h | 4 +- .../UmlBaseCollaborationDiagramDefinition.cpp | 6 +- .../UmlBaseCollaborationDiagramDefinition.h | 12 +- .../deploy/UmlBaseCollaborationMessage.cpp | 2 +- .../deploy/UmlBaseCollaborationMessage.h | 10 +- genplugouts/deploy/UmlBaseComponent.cpp | 14 +- genplugouts/deploy/UmlBaseComponent.h | 23 +- genplugouts/deploy/UmlBaseComponentDiagram.h | 4 +- genplugouts/deploy/UmlBaseComponentView.h | 4 +- .../deploy/UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/deploy/UmlBaseDeployment.h | 4 +- genplugouts/deploy/UmlBaseDeploymentDiagram.h | 4 +- genplugouts/deploy/UmlBaseDeploymentView.h | 4 +- genplugouts/deploy/UmlBaseDiagram.cpp | 4 +- genplugouts/deploy/UmlBaseDiagram.h | 6 +- .../deploy/UmlBaseEntryPointPseudoState.h | 4 +- .../deploy/UmlBaseExitPointPseudoState.h | 4 +- genplugouts/deploy/UmlBaseExpansionNode.h | 4 +- genplugouts/deploy/UmlBaseExpansionRegion.h | 4 +- .../deploy/UmlBaseExtraClassMember.cpp | 4 +- genplugouts/deploy/UmlBaseExtraClassMember.h | 8 +- genplugouts/deploy/UmlBaseFinalState.h | 4 +- genplugouts/deploy/UmlBaseFlow.cpp | 26 +- genplugouts/deploy/UmlBaseFlow.h | 28 +- genplugouts/deploy/UmlBaseForkPseudoState.h | 4 +- genplugouts/deploy/UmlBaseFormalParameter.h | 10 +- genplugouts/deploy/UmlBaseFragment.cpp | 8 +- genplugouts/deploy/UmlBaseFragment.h | 31 +- .../deploy/UmlBaseFragmentCompartment.cpp | 16 +- .../deploy/UmlBaseFragmentCompartment.h | 24 +- .../deploy/UmlBaseInitialPseudoState.h | 4 +- .../UmlBaseInterruptibleActivityRegion.h | 4 +- genplugouts/deploy/UmlBaseItem.cpp | 54 +- genplugouts/deploy/UmlBaseItem.h | 53 +- genplugouts/deploy/UmlBaseJoinPseudoState.h | 4 +- .../deploy/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/deploy/UmlBaseMessage.cpp | 2 +- genplugouts/deploy/UmlBaseMessage.h | 13 +- genplugouts/deploy/UmlBaseNcRelation.h | 6 +- genplugouts/deploy/UmlBaseNode.h | 4 +- genplugouts/deploy/UmlBaseObjectDiagram.h | 4 +- genplugouts/deploy/UmlBaseOnSignalAction.cpp | 8 +- genplugouts/deploy/UmlBaseOnSignalAction.h | 16 +- genplugouts/deploy/UmlBaseOperation.cpp | 46 +- genplugouts/deploy/UmlBaseOperation.h | 58 +- genplugouts/deploy/UmlBasePackage.cpp | 52 +- genplugouts/deploy/UmlBasePackage.h | 76 +- genplugouts/deploy/UmlBaseParameter.h | 6 +- genplugouts/deploy/UmlBaseParameterSet.cpp | 8 +- genplugouts/deploy/UmlBaseParameterSet.h | 13 +- genplugouts/deploy/UmlBasePinParameter.h | 4 +- genplugouts/deploy/UmlBaseRegion.h | 4 +- genplugouts/deploy/UmlBaseRelation.cpp | 12 +- genplugouts/deploy/UmlBaseRelation.h | 24 +- genplugouts/deploy/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseSequenceDiagramDefinition.cpp | 14 +- .../deploy/UmlBaseSequenceDiagramDefinition.h | 14 +- genplugouts/deploy/UmlBaseSequenceMessage.cpp | 2 +- genplugouts/deploy/UmlBaseSequenceMessage.h | 12 +- .../deploy/UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/deploy/UmlBaseState.cpp | 20 +- genplugouts/deploy/UmlBaseState.h | 22 +- genplugouts/deploy/UmlBaseStateAction.cpp | 8 +- genplugouts/deploy/UmlBaseStateAction.h | 16 +- genplugouts/deploy/UmlBaseStateDiagram.h | 4 +- genplugouts/deploy/UmlBaseSubject.cpp | 2 +- genplugouts/deploy/UmlBaseSubject.h | 13 +- .../deploy/UmlBaseTerminatePseudoState.h | 4 +- genplugouts/deploy/UmlBaseTransition.cpp | 20 +- genplugouts/deploy/UmlBaseTransition.h | 22 +- genplugouts/deploy/UmlBaseTypeSpec.cpp | 4 +- genplugouts/deploy/UmlBaseTypeSpec.h | 9 +- genplugouts/deploy/UmlBaseUseCase.cpp | 4 +- genplugouts/deploy/UmlBaseUseCase.h | 8 +- .../deploy/UmlBaseUseCaseAssociation.cpp | 2 +- .../deploy/UmlBaseUseCaseAssociation.h | 17 +- genplugouts/deploy/UmlBaseUseCaseDiagram.h | 4 +- .../UmlBaseUseCaseDiagramDefinition.cpp | 10 +- .../deploy/UmlBaseUseCaseDiagramDefinition.h | 24 +- .../deploy/UmlBaseUseCaseReference.cpp | 2 +- genplugouts/deploy/UmlBaseUseCaseReference.h | 6 +- genplugouts/deploy/UmlBaseUseCaseView.h | 4 +- genplugouts/deploy/UmlBaseView.h | 4 +- genplugouts/deploy/UmlBuiltin.h | 18 +- genplugouts/deploy/UmlClass.cpp | 12 +- genplugouts/deploy/UmlClass.h | 4 +- genplugouts/deploy/UmlClassDiagram.h | 4 +- genplugouts/deploy/UmlClassInstance.h | 4 +- genplugouts/deploy/UmlClassItem.h | 4 +- genplugouts/deploy/UmlClassMember.h | 4 +- genplugouts/deploy/UmlClassView.cpp | 4 +- genplugouts/deploy/UmlClassView.h | 4 +- genplugouts/deploy/UmlCollaborationDiagram.h | 4 +- genplugouts/deploy/UmlCom.cpp | 43 +- genplugouts/deploy/UmlCom.h | 24 +- genplugouts/deploy/UmlComponent.h | 4 +- genplugouts/deploy/UmlComponentDiagram.h | 4 +- genplugouts/deploy/UmlComponentView.h | 4 +- genplugouts/deploy/UmlDeploymentDiagram.h | 4 +- genplugouts/deploy/UmlDeploymentView.h | 4 +- genplugouts/deploy/UmlDiagram.h | 4 +- genplugouts/deploy/UmlEntryPointPseudoState.h | 4 +- genplugouts/deploy/UmlExitPointPseudoState.h | 4 +- genplugouts/deploy/UmlExpansionNode.h | 4 +- genplugouts/deploy/UmlExpansionRegion.h | 4 +- genplugouts/deploy/UmlExtraClassMember.h | 4 +- genplugouts/deploy/UmlFlow.h | 4 +- .../deploy/UmlInterruptibleActivityRegion.h | 4 +- genplugouts/deploy/UmlItem.h | 4 +- genplugouts/deploy/UmlNcRelation.h | 4 +- genplugouts/deploy/UmlNode.h | 4 +- genplugouts/deploy/UmlObjectDiagram.h | 4 +- genplugouts/deploy/UmlOnSignalAction.h | 4 +- genplugouts/deploy/UmlOperation.h | 4 +- genplugouts/deploy/UmlPackage.h | 4 +- genplugouts/deploy/UmlParameterSet.h | 4 +- genplugouts/deploy/UmlPinParameter.h | 4 +- genplugouts/deploy/UmlPseudoState.h | 4 +- genplugouts/deploy/UmlRegion.h | 4 +- genplugouts/deploy/UmlRelation.h | 4 +- genplugouts/deploy/UmlSequenceDiagram.h | 4 +- genplugouts/deploy/UmlSettings.cpp | 72 +- genplugouts/deploy/UmlSettings.h | 56 +- genplugouts/deploy/UmlState.h | 4 +- genplugouts/deploy/UmlStateDiagram.h | 4 +- genplugouts/deploy/UmlStereotype.h | 14 +- genplugouts/deploy/UmlTransition.h | 4 +- genplugouts/deploy/UmlUseCase.h | 4 +- genplugouts/deploy/UmlUseCaseDiagram.h | 4 +- genplugouts/deploy/UmlUseCaseView.h | 4 +- genplugouts/deploy/UmlView.h | 4 +- genplugouts/deploy/deploy.pro | 9 +- genplugouts/gpro/ClassGlobalCmd.cpp | 2 +- genplugouts/gpro/CmdFamily.cpp | 2 +- genplugouts/gpro/CppSettings.cpp | 201 +- genplugouts/gpro/CppSettings.h | 224 +- genplugouts/gpro/CppSettingsCmd.cpp | 2 +- genplugouts/gpro/Dialog.cpp | 209 +- genplugouts/gpro/Dialog.h | 36 +- genplugouts/gpro/IdlSettings.cpp | 191 +- genplugouts/gpro/IdlSettings.h | 160 +- genplugouts/gpro/IdlSettingsCmd.cpp | 2 +- genplugouts/gpro/JavaSettings.cpp | 145 +- genplugouts/gpro/JavaSettings.h | 112 +- genplugouts/gpro/JavaSettingsCmd.cpp | 2 +- genplugouts/gpro/MiscGlobalCmd.cpp | 2 +- genplugouts/gpro/OnInstanceCmd.cpp | 2 +- genplugouts/gpro/OnInstanceCmd.h | 269 +- genplugouts/gpro/PackageGlobalCmd.cpp | 2 +- genplugouts/gpro/UmlActualParameter.h | 5 +- genplugouts/gpro/UmlArtifact.cpp | 81 +- genplugouts/gpro/UmlArtifact.h | 6 +- genplugouts/gpro/UmlAttribute.h | 9 +- genplugouts/gpro/UmlBaseActualParameter.cpp | 29 +- genplugouts/gpro/UmlBaseActualParameter.h | 9 +- genplugouts/gpro/UmlBaseArtifact.cpp | 66 +- genplugouts/gpro/UmlBaseArtifact.h | 61 +- genplugouts/gpro/UmlBaseAttribute.cpp | 254 +- genplugouts/gpro/UmlBaseAttribute.h | 62 +- genplugouts/gpro/UmlBaseClass.cpp | 41 +- genplugouts/gpro/UmlBaseClass.h | 76 +- genplugouts/gpro/UmlBaseClassDiagram.cpp | 7 +- genplugouts/gpro/UmlBaseClassDiagram.h | 11 +- genplugouts/gpro/UmlBaseClassItem.cpp | 88 +- genplugouts/gpro/UmlBaseClassItem.h | 63 +- genplugouts/gpro/UmlBaseClassMember.cpp | 103 +- genplugouts/gpro/UmlBaseClassMember.h | 23 +- genplugouts/gpro/UmlBaseClassView.cpp | 41 +- genplugouts/gpro/UmlBaseClassView.h | 15 +- .../gpro/UmlBaseCollaborationDiagram.cpp | 7 +- .../gpro/UmlBaseCollaborationDiagram.h | 11 +- genplugouts/gpro/UmlBaseComponent.cpp | 41 +- genplugouts/gpro/UmlBaseComponent.h | 18 +- genplugouts/gpro/UmlBaseComponentDiagram.cpp | 7 +- genplugouts/gpro/UmlBaseComponentDiagram.h | 11 +- genplugouts/gpro/UmlBaseComponentView.cpp | 7 +- genplugouts/gpro/UmlBaseComponentView.h | 11 +- genplugouts/gpro/UmlBaseDeployment.h | 9 +- genplugouts/gpro/UmlBaseDeploymentDiagram.cpp | 7 +- genplugouts/gpro/UmlBaseDeploymentDiagram.h | 11 +- genplugouts/gpro/UmlBaseDeploymentView.cpp | 7 +- genplugouts/gpro/UmlBaseDeploymentView.h | 11 +- genplugouts/gpro/UmlBaseDiagram.cpp | 5 +- genplugouts/gpro/UmlBaseDiagram.h | 13 +- genplugouts/gpro/UmlBaseExtraClassMember.cpp | 53 +- genplugouts/gpro/UmlBaseExtraClassMember.h | 23 +- genplugouts/gpro/UmlBaseFormalParameter.cpp | 14 +- genplugouts/gpro/UmlBaseFormalParameter.h | 29 +- genplugouts/gpro/UmlBaseItem.cpp | 117 +- genplugouts/gpro/UmlBaseItem.h | 61 +- genplugouts/gpro/UmlBaseNcRelation.cpp | 48 +- genplugouts/gpro/UmlBaseNcRelation.h | 18 +- genplugouts/gpro/UmlBaseNode.cpp | 41 +- genplugouts/gpro/UmlBaseNode.h | 13 +- genplugouts/gpro/UmlBaseOperation.cpp | 56 +- genplugouts/gpro/UmlBaseOperation.h | 144 +- genplugouts/gpro/UmlBasePackage.cpp | 230 +- genplugouts/gpro/UmlBasePackage.h | 107 +- genplugouts/gpro/UmlBaseRelation.cpp | 458 +- genplugouts/gpro/UmlBaseRelation.h | 75 +- genplugouts/gpro/UmlBaseSequenceDiagram.cpp | 7 +- genplugouts/gpro/UmlBaseSequenceDiagram.h | 11 +- genplugouts/gpro/UmlBaseUseCase.cpp | 42 +- genplugouts/gpro/UmlBaseUseCase.h | 14 +- genplugouts/gpro/UmlBaseUseCaseDiagram.cpp | 7 +- genplugouts/gpro/UmlBaseUseCaseDiagram.h | 11 +- genplugouts/gpro/UmlBaseUseCaseView.cpp | 7 +- genplugouts/gpro/UmlBaseUseCaseView.h | 11 +- genplugouts/gpro/UmlBuiltin.h | 16 +- genplugouts/gpro/UmlClass.h | 9 +- genplugouts/gpro/UmlClassDiagram.h | 9 +- genplugouts/gpro/UmlClassItem.h | 9 +- genplugouts/gpro/UmlClassMember.h | 8 +- genplugouts/gpro/UmlClassView.h | 9 +- genplugouts/gpro/UmlCollaborationDiagram.h | 9 +- genplugouts/gpro/UmlCom.cpp | 620 +- genplugouts/gpro/UmlCom.h | 34 +- genplugouts/gpro/UmlComponent.cpp | 2 +- genplugouts/gpro/UmlComponent.h | 9 +- genplugouts/gpro/UmlComponentDiagram.h | 9 +- genplugouts/gpro/UmlComponentView.h | 9 +- genplugouts/gpro/UmlDeploymentDiagram.h | 9 +- genplugouts/gpro/UmlDeploymentView.h | 9 +- genplugouts/gpro/UmlDiagram.h | 9 +- genplugouts/gpro/UmlExtraClassMember.h | 9 +- genplugouts/gpro/UmlFormalParameter.h | 7 +- genplugouts/gpro/UmlItem.cpp | 8 +- genplugouts/gpro/UmlItem.h | 4 +- genplugouts/gpro/UmlNcRelation.h | 9 +- genplugouts/gpro/UmlNode.h | 9 +- genplugouts/gpro/UmlOperation.h | 9 +- genplugouts/gpro/UmlPackage.h | 9 +- genplugouts/gpro/UmlParameter.h | 6 +- genplugouts/gpro/UmlRelation.h | 9 +- genplugouts/gpro/UmlSequenceDiagram.h | 9 +- genplugouts/gpro/UmlSettings.cpp | 39 +- genplugouts/gpro/UmlSettings.h | 24 +- genplugouts/gpro/UmlSettingsCmd.cpp | 2 +- genplugouts/gpro/UmlStereotype.h | 10 +- genplugouts/gpro/UmlTypeSpec.cpp | 7 +- genplugouts/gpro/UmlTypeSpec.h | 6 +- genplugouts/gpro/UmlUseCase.h | 9 +- genplugouts/gpro/UmlUseCaseDiagram.h | 9 +- genplugouts/gpro/UmlUseCaseView.h | 9 +- genplugouts/gpro/anItemKind.h | 44 +- genplugouts/gpro/gpro.pro | 332 +- genplugouts/gpro/gridbox.cpp | 37 + genplugouts/gpro/gridbox.h | 26 + genplugouts/gpro/hhbox.cpp | 29 + genplugouts/gpro/hhbox.h | 22 + genplugouts/import_rose/Artifact.cpp | 116 +- genplugouts/import_rose/Artifact.h | 35 +- genplugouts/import_rose/CppSettings.cpp | 198 +- genplugouts/import_rose/CppSettings.h | 170 +- genplugouts/import_rose/File.cpp | 128 +- genplugouts/import_rose/File.h | 26 +- genplugouts/import_rose/IdlSettings.cpp | 188 +- genplugouts/import_rose/IdlSettings.h | 160 +- genplugouts/import_rose/JavaSettings.cpp | 144 +- genplugouts/import_rose/JavaSettings.h | 112 +- genplugouts/import_rose/Uc.cpp | 13 +- genplugouts/import_rose/Uc.h | 4 +- .../import_rose/UmlActualParameter.cpp | 4 +- genplugouts/import_rose/UmlArtifact.h | 4 +- genplugouts/import_rose/UmlAttribute.cpp | 52 +- genplugouts/import_rose/UmlAttribute.h | 16 +- genplugouts/import_rose/UmlBaseArtifact.cpp | 65 +- genplugouts/import_rose/UmlBaseArtifact.h | 61 +- genplugouts/import_rose/UmlBaseAttribute.cpp | 19 +- genplugouts/import_rose/UmlBaseAttribute.h | 25 +- genplugouts/import_rose/UmlBaseClass.cpp | 38 +- genplugouts/import_rose/UmlBaseClass.h | 39 +- .../import_rose/UmlBaseClassDiagram.cpp | 2 +- genplugouts/import_rose/UmlBaseClassDiagram.h | 6 +- genplugouts/import_rose/UmlBaseClassItem.cpp | 31 +- genplugouts/import_rose/UmlBaseClassItem.h | 36 +- .../import_rose/UmlBaseClassMember.cpp | 9 +- genplugouts/import_rose/UmlBaseClassMember.h | 11 +- genplugouts/import_rose/UmlBaseClassView.h | 4 +- .../import_rose/UmlBaseCollaborationDiagram.h | 4 +- genplugouts/import_rose/UmlBaseComponent.h | 8 +- .../import_rose/UmlBaseComponentDiagram.h | 4 +- .../import_rose/UmlBaseComponentView.h | 4 +- genplugouts/import_rose/UmlBaseDeployment.h | 4 +- .../import_rose/UmlBaseDeploymentDiagram.h | 4 +- .../import_rose/UmlBaseDeploymentView.h | 4 +- genplugouts/import_rose/UmlBaseDiagram.cpp | 4 +- genplugouts/import_rose/UmlBaseDiagram.h | 6 +- .../import_rose/UmlBaseExtraClassMember.cpp | 4 +- .../import_rose/UmlBaseExtraClassMember.h | 8 +- .../import_rose/UmlBaseFormalParameter.h | 10 +- genplugouts/import_rose/UmlBaseItem.cpp | 121 +- genplugouts/import_rose/UmlBaseItem.h | 61 +- genplugouts/import_rose/UmlBaseNcRelation.h | 6 +- genplugouts/import_rose/UmlBaseNode.h | 4 +- genplugouts/import_rose/UmlBaseOperation.cpp | 71 +- genplugouts/import_rose/UmlBaseOperation.h | 99 +- genplugouts/import_rose/UmlBasePackage.cpp | 57 +- genplugouts/import_rose/UmlBasePackage.h | 75 +- genplugouts/import_rose/UmlBaseRelation.cpp | 25 +- genplugouts/import_rose/UmlBaseRelation.h | 35 +- .../import_rose/UmlBaseSequenceDiagram.h | 4 +- genplugouts/import_rose/UmlBaseUseCase.cpp | 1 + genplugouts/import_rose/UmlBaseUseCase.h | 6 +- .../import_rose/UmlBaseUseCaseDiagram.h | 4 +- genplugouts/import_rose/UmlBaseUseCaseView.h | 4 +- genplugouts/import_rose/UmlBuiltin.h | 16 +- genplugouts/import_rose/UmlClass.cpp | 128 +- genplugouts/import_rose/UmlClass.h | 34 +- genplugouts/import_rose/UmlClassDiagram.cpp | 16 +- genplugouts/import_rose/UmlClassDiagram.h | 6 +- genplugouts/import_rose/UmlClassItem.h | 4 +- genplugouts/import_rose/UmlClassMember.h | 4 +- genplugouts/import_rose/UmlClassView.cpp | 30 +- genplugouts/import_rose/UmlClassView.h | 4 +- .../import_rose/UmlCollaborationDiagram.cpp | 14 +- .../import_rose/UmlCollaborationDiagram.h | 4 +- genplugouts/import_rose/UmlCom.cpp | 50 +- genplugouts/import_rose/UmlCom.h | 22 +- genplugouts/import_rose/UmlComponent.h | 4 +- genplugouts/import_rose/UmlComponentDiagram.h | 4 +- genplugouts/import_rose/UmlComponentView.h | 4 +- .../import_rose/UmlDeploymentDiagram.h | 4 +- genplugouts/import_rose/UmlDeploymentView.cpp | 28 +- genplugouts/import_rose/UmlDeploymentView.h | 12 +- genplugouts/import_rose/UmlDiagram.h | 4 +- genplugouts/import_rose/UmlExtraClassMember.h | 4 +- .../import_rose/UmlFormalParameter.cpp | 4 +- genplugouts/import_rose/UmlItem.cpp | 37 +- genplugouts/import_rose/UmlItem.h | 13 +- genplugouts/import_rose/UmlNcRelation.h | 4 +- genplugouts/import_rose/UmlNode.cpp | 16 +- genplugouts/import_rose/UmlNode.h | 6 +- genplugouts/import_rose/UmlOperation.cpp | 94 +- genplugouts/import_rose/UmlOperation.h | 14 +- genplugouts/import_rose/UmlPackage.cpp | 28 +- genplugouts/import_rose/UmlPackage.h | 20 +- genplugouts/import_rose/UmlParameter.h | 6 +- genplugouts/import_rose/UmlRelation.cpp | 28 +- genplugouts/import_rose/UmlRelation.h | 18 +- .../import_rose/UmlSequenceDiagram.cpp | 14 +- genplugouts/import_rose/UmlSequenceDiagram.h | 4 +- genplugouts/import_rose/UmlSettings.cpp | 39 +- genplugouts/import_rose/UmlSettings.h | 24 +- genplugouts/import_rose/UmlStereotype.h | 10 +- genplugouts/import_rose/UmlTypeSpec.cpp | 4 +- genplugouts/import_rose/UmlTypeSpec.h | 6 +- genplugouts/import_rose/UmlUseCase.cpp | 26 +- genplugouts/import_rose/UmlUseCase.h | 6 +- genplugouts/import_rose/UmlUseCaseDiagram.cpp | 14 +- genplugouts/import_rose/UmlUseCaseDiagram.h | 4 +- genplugouts/import_rose/UmlUseCaseView.cpp | 20 +- genplugouts/import_rose/UmlUseCaseView.h | 6 +- genplugouts/import_rose/import_rose.pro | 184 + genplugouts/import_rose/rose.pro | 1 - genplugouts/import_rose/util.cpp | 8 +- genplugouts/import_rose/util.h | 6 +- genplugouts/plugouts.pro | 3 +- genplugouts/singleton/ClassGlobalCmd.h | 4 +- genplugouts/singleton/CmdFamily.h | 2 + genplugouts/singleton/CppSettings.cpp | 198 +- genplugouts/singleton/CppSettings.h | 170 +- genplugouts/singleton/CppSettingsCmd.h | 4 +- genplugouts/singleton/IdlSettings.cpp | 188 +- genplugouts/singleton/IdlSettings.h | 160 +- genplugouts/singleton/IdlSettingsCmd.h | 6 +- genplugouts/singleton/JavaSettings.cpp | 145 +- genplugouts/singleton/JavaSettings.h | 112 +- genplugouts/singleton/JavaSettingsCmd.h | 4 +- genplugouts/singleton/MiscGlobalCmd.h | 4 +- genplugouts/singleton/OnInstanceCmd.h | 4 +- genplugouts/singleton/PackageGlobalCmd.h | 10 +- genplugouts/singleton/UmlArtifact.h | 4 +- genplugouts/singleton/UmlAttribute.h | 4 +- genplugouts/singleton/UmlBaseArtifact.cpp | 46 +- genplugouts/singleton/UmlBaseArtifact.h | 43 +- genplugouts/singleton/UmlBaseAttribute.cpp | 6 +- genplugouts/singleton/UmlBaseAttribute.h | 14 +- genplugouts/singleton/UmlBaseClass.cpp | 20 +- genplugouts/singleton/UmlBaseClass.h | 16 +- genplugouts/singleton/UmlBaseClassDiagram.h | 4 +- genplugouts/singleton/UmlBaseClassItem.cpp | 8 +- genplugouts/singleton/UmlBaseClassItem.h | 16 +- genplugouts/singleton/UmlBaseClassMember.cpp | 2 +- genplugouts/singleton/UmlBaseClassMember.h | 4 +- genplugouts/singleton/UmlBaseClassView.h | 4 +- .../singleton/UmlBaseCollaborationDiagram.h | 4 +- genplugouts/singleton/UmlBaseComponent.h | 8 +- .../singleton/UmlBaseComponentDiagram.h | 4 +- genplugouts/singleton/UmlBaseComponentView.h | 4 +- genplugouts/singleton/UmlBaseDeployment.h | 4 +- .../singleton/UmlBaseDeploymentDiagram.h | 4 +- genplugouts/singleton/UmlBaseDeploymentView.h | 4 +- genplugouts/singleton/UmlBaseDiagram.cpp | 4 +- genplugouts/singleton/UmlBaseDiagram.h | 6 +- .../singleton/UmlBaseExtraClassMember.cpp | 4 +- .../singleton/UmlBaseExtraClassMember.h | 8 +- .../singleton/UmlBaseFormalParameter.h | 10 +- genplugouts/singleton/UmlBaseItem.cpp | 46 +- genplugouts/singleton/UmlBaseItem.h | 48 +- genplugouts/singleton/UmlBaseNcRelation.h | 6 +- genplugouts/singleton/UmlBaseNode.h | 4 +- genplugouts/singleton/UmlBaseOperation.cpp | 30 +- genplugouts/singleton/UmlBaseOperation.h | 38 +- genplugouts/singleton/UmlBasePackage.cpp | 42 +- genplugouts/singleton/UmlBasePackage.h | 54 +- genplugouts/singleton/UmlBaseRelation.cpp | 12 +- genplugouts/singleton/UmlBaseRelation.h | 24 +- .../singleton/UmlBaseSequenceDiagram.h | 4 +- genplugouts/singleton/UmlBaseUseCase.cpp | 1 + genplugouts/singleton/UmlBaseUseCase.h | 5 +- genplugouts/singleton/UmlBaseUseCaseDiagram.h | 4 +- genplugouts/singleton/UmlBaseUseCaseView.h | 4 +- genplugouts/singleton/UmlBuiltin.h | 16 +- genplugouts/singleton/UmlClass.cpp | 20 +- genplugouts/singleton/UmlClass.h | 4 +- genplugouts/singleton/UmlClassDiagram.h | 4 +- genplugouts/singleton/UmlClassItem.h | 4 +- genplugouts/singleton/UmlClassMember.h | 4 +- genplugouts/singleton/UmlClassView.h | 4 +- .../singleton/UmlCollaborationDiagram.h | 4 +- genplugouts/singleton/UmlCom.cpp | 32 +- genplugouts/singleton/UmlCom.h | 18 +- genplugouts/singleton/UmlComponent.h | 4 +- genplugouts/singleton/UmlComponentDiagram.h | 4 +- genplugouts/singleton/UmlComponentView.h | 4 +- genplugouts/singleton/UmlDeploymentDiagram.h | 4 +- genplugouts/singleton/UmlDeploymentView.h | 4 +- genplugouts/singleton/UmlDiagram.h | 4 +- genplugouts/singleton/UmlExtraClassMember.h | 4 +- genplugouts/singleton/UmlItem.h | 4 +- genplugouts/singleton/UmlNcRelation.h | 4 +- genplugouts/singleton/UmlNode.h | 4 +- genplugouts/singleton/UmlOperation.h | 4 +- genplugouts/singleton/UmlPackage.h | 4 +- genplugouts/singleton/UmlParameter.h | 6 +- genplugouts/singleton/UmlRelation.h | 4 +- genplugouts/singleton/UmlSequenceDiagram.h | 4 +- genplugouts/singleton/UmlSettings.cpp | 36 +- genplugouts/singleton/UmlSettings.h | 24 +- genplugouts/singleton/UmlSettingsCmd.h | 4 +- genplugouts/singleton/UmlStereotype.h | 10 +- genplugouts/singleton/UmlTypeSpec.cpp | 4 +- genplugouts/singleton/UmlTypeSpec.h | 6 +- genplugouts/singleton/UmlUseCase.h | 4 +- genplugouts/singleton/UmlUseCaseDiagram.h | 4 +- genplugouts/singleton/UmlUseCaseView.h | 4 +- genplugouts/singleton/singleton.pro | 7 +- genplugouts/sm/CppSettings.cpp | 208 +- genplugouts/sm/CppSettings.h | 182 +- genplugouts/sm/FlowBehavior.h | 10 +- genplugouts/sm/IdlSettings.cpp | 186 +- genplugouts/sm/IdlSettings.h | 160 +- genplugouts/sm/JavaSettings.cpp | 148 +- genplugouts/sm/JavaSettings.h | 124 +- genplugouts/sm/PackageGlobalCmd.h | 6 +- genplugouts/sm/PhpSettings.cpp | 117 +- genplugouts/sm/PhpSettings.h | 101 +- genplugouts/sm/SlotAttribute.h | 6 +- genplugouts/sm/SmGenerator.pro | 1 - genplugouts/sm/StateBehavior.h | 8 +- genplugouts/sm/TransitionBehavior.h | 8 +- genplugouts/sm/UmlAccessVariableValueAction.h | 4 +- genplugouts/sm/UmlActivity.h | 4 +- genplugouts/sm/UmlActivityAction.h | 4 +- genplugouts/sm/UmlActivityActionClasses.h | 30 +- genplugouts/sm/UmlActivityControlNode.h | 4 +- .../sm/UmlActivityControlNodeClasses.h | 16 +- genplugouts/sm/UmlActivityDiagram.h | 4 +- genplugouts/sm/UmlActivityNode.h | 4 +- genplugouts/sm/UmlActivityObject.h | 4 +- genplugouts/sm/UmlActivityParameter.h | 4 +- genplugouts/sm/UmlActivityPin.h | 4 +- genplugouts/sm/UmlActivityRegion.h | 4 +- genplugouts/sm/UmlArtifact.h | 4 +- genplugouts/sm/UmlAttribute.h | 4 +- .../sm/UmlBaseAccessVariableValueAction.h | 4 +- genplugouts/sm/UmlBaseActivity.cpp | 14 +- genplugouts/sm/UmlBaseActivity.h | 28 +- genplugouts/sm/UmlBaseActivityAction.cpp | 14 +- genplugouts/sm/UmlBaseActivityAction.h | 28 +- .../sm/UmlBaseActivityActionClasses.cpp | 20 +- genplugouts/sm/UmlBaseActivityActionClasses.h | 66 +- genplugouts/sm/UmlBaseActivityControlNode.h | 4 +- .../sm/UmlBaseActivityControlNodeClasses.h | 16 +- genplugouts/sm/UmlBaseActivityDiagram.h | 4 +- genplugouts/sm/UmlBaseActivityNode.h | 4 +- genplugouts/sm/UmlBaseActivityObject.cpp | 12 +- genplugouts/sm/UmlBaseActivityObject.h | 24 +- genplugouts/sm/UmlBaseActivityParameter.cpp | 4 +- genplugouts/sm/UmlBaseActivityParameter.h | 8 +- genplugouts/sm/UmlBaseActivityPin.h | 4 +- genplugouts/sm/UmlBaseActivityRegion.h | 4 +- genplugouts/sm/UmlBaseArtifact.cpp | 52 +- genplugouts/sm/UmlBaseArtifact.h | 49 +- genplugouts/sm/UmlBaseAttribute.cpp | 8 +- genplugouts/sm/UmlBaseAttribute.h | 18 +- genplugouts/sm/UmlBaseChoicePseudoState.h | 4 +- genplugouts/sm/UmlBaseClass.cpp | 32 +- genplugouts/sm/UmlBaseClass.h | 22 +- genplugouts/sm/UmlBaseClassDiagram.h | 4 +- genplugouts/sm/UmlBaseClassInstance.cpp | 18 +- genplugouts/sm/UmlBaseClassInstance.h | 16 +- genplugouts/sm/UmlBaseClassItem.cpp | 10 +- genplugouts/sm/UmlBaseClassItem.h | 20 +- genplugouts/sm/UmlBaseClassMember.cpp | 6 +- genplugouts/sm/UmlBaseClassMember.h | 12 +- genplugouts/sm/UmlBaseClassView.h | 4 +- genplugouts/sm/UmlBaseCollaborationDiagram.h | 4 +- genplugouts/sm/UmlBaseComponent.cpp | 14 +- genplugouts/sm/UmlBaseComponent.h | 23 +- genplugouts/sm/UmlBaseComponentDiagram.h | 4 +- genplugouts/sm/UmlBaseComponentView.h | 4 +- .../sm/UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/sm/UmlBaseDeployment.h | 4 +- genplugouts/sm/UmlBaseDeploymentDiagram.h | 4 +- genplugouts/sm/UmlBaseDeploymentView.h | 4 +- genplugouts/sm/UmlBaseDiagram.cpp | 4 +- genplugouts/sm/UmlBaseDiagram.h | 6 +- genplugouts/sm/UmlBaseEntryPointPseudoState.h | 4 +- genplugouts/sm/UmlBaseExitPointPseudoState.h | 4 +- genplugouts/sm/UmlBaseExpansionNode.h | 4 +- genplugouts/sm/UmlBaseExpansionRegion.h | 4 +- genplugouts/sm/UmlBaseExtraClassMember.cpp | 4 +- genplugouts/sm/UmlBaseExtraClassMember.h | 8 +- genplugouts/sm/UmlBaseFinalState.h | 4 +- genplugouts/sm/UmlBaseFlow.cpp | 26 +- genplugouts/sm/UmlBaseFlow.h | 28 +- genplugouts/sm/UmlBaseForkPseudoState.h | 4 +- genplugouts/sm/UmlBaseFormalParameter.h | 10 +- genplugouts/sm/UmlBaseInitialPseudoState.h | 4 +- .../sm/UmlBaseInterruptibleActivityRegion.h | 4 +- genplugouts/sm/UmlBaseItem.cpp | 66 +- genplugouts/sm/UmlBaseItem.h | 52 +- genplugouts/sm/UmlBaseJoinPseudoState.h | 4 +- genplugouts/sm/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/sm/UmlBaseNcRelation.h | 6 +- genplugouts/sm/UmlBaseNode.h | 4 +- genplugouts/sm/UmlBaseObjectDiagram.h | 4 +- genplugouts/sm/UmlBaseOnSignalAction.cpp | 8 +- genplugouts/sm/UmlBaseOnSignalAction.h | 16 +- genplugouts/sm/UmlBaseOperation.cpp | 56 +- genplugouts/sm/UmlBaseOperation.h | 74 +- genplugouts/sm/UmlBasePackage.cpp | 48 +- genplugouts/sm/UmlBasePackage.h | 62 +- genplugouts/sm/UmlBaseParameter.h | 6 +- genplugouts/sm/UmlBaseParameterSet.cpp | 8 +- genplugouts/sm/UmlBaseParameterSet.h | 12 +- genplugouts/sm/UmlBasePinParameter.h | 4 +- genplugouts/sm/UmlBaseRegion.h | 4 +- genplugouts/sm/UmlBaseRelation.cpp | 12 +- genplugouts/sm/UmlBaseRelation.h | 24 +- genplugouts/sm/UmlBaseSequenceDiagram.h | 4 +- .../sm/UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/sm/UmlBaseState.cpp | 20 +- genplugouts/sm/UmlBaseState.h | 22 +- genplugouts/sm/UmlBaseStateAction.cpp | 8 +- genplugouts/sm/UmlBaseStateAction.h | 16 +- genplugouts/sm/UmlBaseStateDiagram.h | 4 +- genplugouts/sm/UmlBaseTerminatePseudoState.h | 4 +- genplugouts/sm/UmlBaseTransition.cpp | 20 +- genplugouts/sm/UmlBaseTransition.h | 22 +- genplugouts/sm/UmlBaseTypeSpec.cpp | 4 +- genplugouts/sm/UmlBaseTypeSpec.h | 6 +- genplugouts/sm/UmlBaseUseCase.cpp | 4 +- genplugouts/sm/UmlBaseUseCase.h | 8 +- genplugouts/sm/UmlBaseUseCaseDiagram.h | 4 +- genplugouts/sm/UmlBaseUseCaseView.h | 4 +- genplugouts/sm/UmlBaseView.h | 4 +- genplugouts/sm/UmlBuiltin.h | 18 +- genplugouts/sm/UmlChoicePseudoState.cpp | 8 +- genplugouts/sm/UmlChoicePseudoState.h | 4 +- genplugouts/sm/UmlClass.cpp | 194 +- genplugouts/sm/UmlClass.h | 6 +- genplugouts/sm/UmlClassDiagram.h | 4 +- genplugouts/sm/UmlClassInstance.h | 4 +- genplugouts/sm/UmlClassItem.h | 4 +- genplugouts/sm/UmlClassMember.cpp | 6 +- genplugouts/sm/UmlClassMember.h | 6 +- genplugouts/sm/UmlClassView.h | 4 +- genplugouts/sm/UmlCollaborationDiagram.h | 4 +- genplugouts/sm/UmlCom.cpp | 64 +- genplugouts/sm/UmlCom.h | 21 +- genplugouts/sm/UmlComponent.h | 4 +- genplugouts/sm/UmlComponentDiagram.h | 4 +- genplugouts/sm/UmlComponentView.h | 4 +- genplugouts/sm/UmlDeploymentDiagram.h | 4 +- genplugouts/sm/UmlDeploymentView.h | 4 +- genplugouts/sm/UmlDiagram.h | 4 +- genplugouts/sm/UmlEntryPointPseudoState.cpp | 6 +- genplugouts/sm/UmlEntryPointPseudoState.h | 6 +- genplugouts/sm/UmlExitPointPseudoState.cpp | 18 +- genplugouts/sm/UmlExitPointPseudoState.h | 10 +- genplugouts/sm/UmlExpansionNode.h | 4 +- genplugouts/sm/UmlExpansionRegion.h | 4 +- genplugouts/sm/UmlExtraClassMember.h | 4 +- genplugouts/sm/UmlFinalState.cpp | 4 +- genplugouts/sm/UmlFinalState.h | 4 +- genplugouts/sm/UmlFlow.h | 4 +- genplugouts/sm/UmlInitialPseudoState.cpp | 2 +- .../sm/UmlInterruptibleActivityRegion.h | 4 +- genplugouts/sm/UmlItem.cpp | 24 +- genplugouts/sm/UmlItem.h | 14 +- genplugouts/sm/UmlJunctionPseudoState.cpp | 20 +- genplugouts/sm/UmlJunctionPseudoState.h | 6 +- genplugouts/sm/UmlNcRelation.h | 4 +- genplugouts/sm/UmlNode.h | 4 +- genplugouts/sm/UmlObjectDiagram.h | 4 +- genplugouts/sm/UmlOnSignalAction.h | 4 +- genplugouts/sm/UmlOperation.cpp | 44 +- genplugouts/sm/UmlOperation.h | 4 +- genplugouts/sm/UmlPackage.h | 4 +- genplugouts/sm/UmlParameterSet.h | 4 +- genplugouts/sm/UmlPinParameter.h | 4 +- genplugouts/sm/UmlPseudoState.h | 4 +- genplugouts/sm/UmlRegion.cpp | 6 +- genplugouts/sm/UmlRegion.h | 6 +- genplugouts/sm/UmlRelation.h | 4 +- genplugouts/sm/UmlSequenceDiagram.h | 4 +- genplugouts/sm/UmlSettings.cpp | 66 +- genplugouts/sm/UmlSettings.h | 56 +- genplugouts/sm/UmlState.cpp | 28 +- genplugouts/sm/UmlState.h | 18 +- genplugouts/sm/UmlStateAction.cpp | 6 +- genplugouts/sm/UmlStateAction.h | 4 +- genplugouts/sm/UmlStateDiagram.h | 4 +- genplugouts/sm/UmlStereotype.h | 12 +- genplugouts/sm/UmlTerminatePseudoState.cpp | 4 +- genplugouts/sm/UmlTerminatePseudoState.h | 4 +- genplugouts/sm/UmlTransition.cpp | 34 +- genplugouts/sm/UmlTransition.h | 14 +- genplugouts/sm/UmlUseCase.h | 4 +- genplugouts/sm/UmlUseCaseDiagram.h | 4 +- genplugouts/sm/UmlUseCaseView.h | 4 +- genplugouts/sm/UmlView.h | 4 +- genplugouts/sm/gridbox.cpp | 37 + genplugouts/sm/gridbox.h | 26 + genplugouts/sm/hhbox.cpp | 29 + genplugouts/sm/hhbox.h | 22 + genplugouts/sm/sm.pro | 368 + genplugouts/tabdialogwrapper.cpp | 80 + genplugouts/tabdialogwrapper.h | 41 + genplugouts/uml_projection/CppSettings.cpp | 254 +- genplugouts/uml_projection/CppSettings.h | 200 +- genplugouts/uml_projection/Dialog.cpp | 62 +- genplugouts/uml_projection/FlowBehavior.h | 10 +- genplugouts/uml_projection/IdlSettings.cpp | 186 +- genplugouts/uml_projection/IdlSettings.h | 160 +- genplugouts/uml_projection/JavaSettings.cpp | 150 +- genplugouts/uml_projection/JavaSettings.h | 124 +- genplugouts/uml_projection/PhpSettings.cpp | 116 +- genplugouts/uml_projection/PhpSettings.h | 101 +- genplugouts/uml_projection/PythonSettings.cpp | 120 +- genplugouts/uml_projection/PythonSettings.h | 98 +- genplugouts/uml_projection/SlotAttribute.h | 6 +- genplugouts/uml_projection/StateBehavior.h | 8 +- .../uml_projection/TransitionBehavior.h | 8 +- .../UmlAccessVariableValueAction.h | 4 +- genplugouts/uml_projection/UmlActivity.h | 4 +- .../uml_projection/UmlActivityAction.h | 4 +- .../uml_projection/UmlActivityActionClasses.h | 30 +- .../uml_projection/UmlActivityControlNode.h | 4 +- .../UmlActivityControlNodeClasses.h | 16 +- .../uml_projection/UmlActivityDiagram.h | 4 +- genplugouts/uml_projection/UmlActivityNode.h | 4 +- .../uml_projection/UmlActivityObject.h | 4 +- .../uml_projection/UmlActivityParameter.h | 4 +- genplugouts/uml_projection/UmlActivityPin.h | 4 +- .../uml_projection/UmlActivityRegion.h | 4 +- genplugouts/uml_projection/UmlArtifact.h | 4 +- genplugouts/uml_projection/UmlAttribute.cpp | 12 +- genplugouts/uml_projection/UmlAttribute.h | 4 +- .../UmlBaseAccessVariableValueAction.h | 4 +- .../uml_projection/UmlBaseActivity.cpp | 14 +- genplugouts/uml_projection/UmlBaseActivity.h | 28 +- .../uml_projection/UmlBaseActivityAction.cpp | 14 +- .../uml_projection/UmlBaseActivityAction.h | 28 +- .../UmlBaseActivityActionClasses.cpp | 20 +- .../UmlBaseActivityActionClasses.h | 66 +- .../UmlBaseActivityControlNode.h | 4 +- .../UmlBaseActivityControlNodeClasses.h | 16 +- .../uml_projection/UmlBaseActivityDiagram.h | 4 +- .../uml_projection/UmlBaseActivityNode.h | 4 +- .../uml_projection/UmlBaseActivityObject.cpp | 12 +- .../uml_projection/UmlBaseActivityObject.h | 24 +- .../UmlBaseActivityParameter.cpp | 4 +- .../uml_projection/UmlBaseActivityParameter.h | 8 +- .../uml_projection/UmlBaseActivityPin.h | 4 +- .../uml_projection/UmlBaseActivityRegion.h | 4 +- .../uml_projection/UmlBaseArtifact.cpp | 56 +- genplugouts/uml_projection/UmlBaseArtifact.h | 54 +- .../uml_projection/UmlBaseAttribute.cpp | 8 +- genplugouts/uml_projection/UmlBaseAttribute.h | 18 +- .../uml_projection/UmlBaseChoicePseudoState.h | 4 +- genplugouts/uml_projection/UmlBaseClass.cpp | 34 +- genplugouts/uml_projection/UmlBaseClass.h | 24 +- .../uml_projection/UmlBaseClassDiagram.h | 4 +- .../uml_projection/UmlBaseClassInstance.cpp | 18 +- .../uml_projection/UmlBaseClassInstance.h | 16 +- .../UmlBaseClassInstanceReference.cpp | 4 +- .../UmlBaseClassInstanceReference.h | 6 +- .../uml_projection/UmlBaseClassItem.cpp | 12 +- genplugouts/uml_projection/UmlBaseClassItem.h | 24 +- .../uml_projection/UmlBaseClassMember.cpp | 6 +- .../uml_projection/UmlBaseClassMember.h | 12 +- genplugouts/uml_projection/UmlBaseClassView.h | 4 +- .../UmlBaseCollaborationDiagram.h | 4 +- .../UmlBaseCollaborationDiagramDefinition.cpp | 6 +- .../UmlBaseCollaborationDiagramDefinition.h | 12 +- .../UmlBaseCollaborationMessage.cpp | 2 +- .../UmlBaseCollaborationMessage.h | 10 +- .../uml_projection/UmlBaseComponent.cpp | 14 +- genplugouts/uml_projection/UmlBaseComponent.h | 23 +- .../uml_projection/UmlBaseComponentDiagram.h | 4 +- .../uml_projection/UmlBaseComponentView.h | 4 +- .../UmlBaseDeepHistoryPseudoState.h | 4 +- .../uml_projection/UmlBaseDeployment.h | 4 +- .../uml_projection/UmlBaseDeploymentDiagram.h | 4 +- .../uml_projection/UmlBaseDeploymentView.h | 4 +- genplugouts/uml_projection/UmlBaseDiagram.cpp | 4 +- genplugouts/uml_projection/UmlBaseDiagram.h | 6 +- .../UmlBaseEntryPointPseudoState.h | 4 +- .../UmlBaseExitPointPseudoState.h | 4 +- .../uml_projection/UmlBaseExpansionNode.h | 4 +- .../uml_projection/UmlBaseExpansionRegion.h | 4 +- .../UmlBaseExtraClassMember.cpp | 4 +- .../uml_projection/UmlBaseExtraClassMember.h | 8 +- .../uml_projection/UmlBaseFinalState.h | 4 +- genplugouts/uml_projection/UmlBaseFlow.cpp | 26 +- genplugouts/uml_projection/UmlBaseFlow.h | 28 +- .../uml_projection/UmlBaseForkPseudoState.h | 4 +- .../uml_projection/UmlBaseFormalParameter.h | 10 +- .../uml_projection/UmlBaseFragment.cpp | 8 +- genplugouts/uml_projection/UmlBaseFragment.h | 30 +- .../UmlBaseFragmentCompartment.cpp | 16 +- .../UmlBaseFragmentCompartment.h | 24 +- .../UmlBaseInitialPseudoState.h | 4 +- .../UmlBaseInterruptibleActivityRegion.h | 4 +- genplugouts/uml_projection/UmlBaseItem.cpp | 56 +- genplugouts/uml_projection/UmlBaseItem.h | 52 +- .../uml_projection/UmlBaseJoinPseudoState.h | 4 +- .../UmlBaseJunctionPseudoState.h | 4 +- genplugouts/uml_projection/UmlBaseMessage.cpp | 2 +- genplugouts/uml_projection/UmlBaseMessage.h | 11 +- .../uml_projection/UmlBaseNcRelation.h | 6 +- genplugouts/uml_projection/UmlBaseNode.h | 4 +- .../uml_projection/UmlBaseObjectDiagram.h | 4 +- .../uml_projection/UmlBaseOnSignalAction.cpp | 8 +- .../uml_projection/UmlBaseOnSignalAction.h | 16 +- .../uml_projection/UmlBaseOperation.cpp | 44 +- genplugouts/uml_projection/UmlBaseOperation.h | 58 +- genplugouts/uml_projection/UmlBasePackage.cpp | 71 +- genplugouts/uml_projection/UmlBasePackage.h | 90 +- genplugouts/uml_projection/UmlBaseParameter.h | 6 +- .../uml_projection/UmlBaseParameterSet.cpp | 8 +- .../uml_projection/UmlBaseParameterSet.h | 12 +- .../uml_projection/UmlBasePinParameter.h | 4 +- genplugouts/uml_projection/UmlBaseRegion.h | 4 +- .../uml_projection/UmlBaseRelation.cpp | 12 +- genplugouts/uml_projection/UmlBaseRelation.h | 24 +- .../uml_projection/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseSequenceDiagramDefinition.cpp | 14 +- .../UmlBaseSequenceDiagramDefinition.h | 14 +- .../uml_projection/UmlBaseSequenceMessage.cpp | 2 +- .../uml_projection/UmlBaseSequenceMessage.h | 12 +- .../UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/uml_projection/UmlBaseState.cpp | 20 +- genplugouts/uml_projection/UmlBaseState.h | 22 +- .../uml_projection/UmlBaseStateAction.cpp | 8 +- .../uml_projection/UmlBaseStateAction.h | 16 +- .../uml_projection/UmlBaseStateDiagram.h | 4 +- genplugouts/uml_projection/UmlBaseSubject.cpp | 2 +- genplugouts/uml_projection/UmlBaseSubject.h | 10 +- .../UmlBaseTerminatePseudoState.h | 4 +- .../uml_projection/UmlBaseTransition.cpp | 20 +- .../uml_projection/UmlBaseTransition.h | 22 +- .../uml_projection/UmlBaseTypeSpec.cpp | 4 +- genplugouts/uml_projection/UmlBaseTypeSpec.h | 6 +- genplugouts/uml_projection/UmlBaseUseCase.cpp | 4 +- genplugouts/uml_projection/UmlBaseUseCase.h | 8 +- .../UmlBaseUseCaseAssociation.cpp | 2 +- .../UmlBaseUseCaseAssociation.h | 17 +- .../uml_projection/UmlBaseUseCaseDiagram.h | 4 +- .../UmlBaseUseCaseDiagramDefinition.cpp | 10 +- .../UmlBaseUseCaseDiagramDefinition.h | 22 +- .../UmlBaseUseCaseReference.cpp | 2 +- .../uml_projection/UmlBaseUseCaseReference.h | 4 +- .../uml_projection/UmlBaseUseCaseView.h | 4 +- genplugouts/uml_projection/UmlBaseView.h | 4 +- genplugouts/uml_projection/UmlBuiltin.h | 18 +- genplugouts/uml_projection/UmlClass.cpp | 26 +- genplugouts/uml_projection/UmlClass.h | 4 +- genplugouts/uml_projection/UmlClassDiagram.h | 4 +- genplugouts/uml_projection/UmlClassInstance.h | 4 +- genplugouts/uml_projection/UmlClassItem.h | 4 +- genplugouts/uml_projection/UmlClassMember.h | 4 +- genplugouts/uml_projection/UmlClassView.cpp | 17 +- genplugouts/uml_projection/UmlClassView.h | 4 +- .../uml_projection/UmlCollaborationDiagram.h | 4 +- genplugouts/uml_projection/UmlCom.cpp | 36 +- genplugouts/uml_projection/UmlCom.h | 18 +- genplugouts/uml_projection/UmlComponent.h | 4 +- .../uml_projection/UmlComponentDiagram.h | 4 +- genplugouts/uml_projection/UmlComponentView.h | 4 +- .../uml_projection/UmlDeploymentDiagram.h | 4 +- .../uml_projection/UmlDeploymentView.h | 4 +- genplugouts/uml_projection/UmlDiagram.h | 4 +- .../uml_projection/UmlEntryPointPseudoState.h | 4 +- .../uml_projection/UmlExitPointPseudoState.h | 4 +- genplugouts/uml_projection/UmlExpansionNode.h | 4 +- .../uml_projection/UmlExpansionRegion.h | 4 +- .../uml_projection/UmlExtraClassMember.h | 4 +- genplugouts/uml_projection/UmlFlow.h | 4 +- .../UmlInterruptibleActivityRegion.h | 4 +- genplugouts/uml_projection/UmlItem.h | 4 +- genplugouts/uml_projection/UmlNcRelation.h | 4 +- genplugouts/uml_projection/UmlNode.h | 4 +- genplugouts/uml_projection/UmlObjectDiagram.h | 4 +- .../uml_projection/UmlOnSignalAction.h | 4 +- genplugouts/uml_projection/UmlOperation.cpp | 70 +- genplugouts/uml_projection/UmlOperation.h | 4 +- genplugouts/uml_projection/UmlPackage.cpp | 10 +- genplugouts/uml_projection/UmlPackage.h | 4 +- genplugouts/uml_projection/UmlParameter.cpp | 17 +- genplugouts/uml_projection/UmlParameter.h | 4 +- genplugouts/uml_projection/UmlParameterSet.h | 4 +- genplugouts/uml_projection/UmlPinParameter.h | 4 +- genplugouts/uml_projection/UmlPseudoState.h | 4 +- genplugouts/uml_projection/UmlRegion.h | 4 +- genplugouts/uml_projection/UmlRelation.cpp | 16 +- genplugouts/uml_projection/UmlRelation.h | 4 +- .../uml_projection/UmlSequenceDiagram.h | 4 +- genplugouts/uml_projection/UmlSettings.cpp | 72 +- genplugouts/uml_projection/UmlSettings.h | 56 +- genplugouts/uml_projection/UmlState.h | 4 +- genplugouts/uml_projection/UmlStateDiagram.h | 4 +- genplugouts/uml_projection/UmlStereotype.h | 14 +- genplugouts/uml_projection/UmlTransition.h | 4 +- genplugouts/uml_projection/UmlUseCase.h | 4 +- .../uml_projection/UmlUseCaseDiagram.h | 4 +- genplugouts/uml_projection/UmlUseCaseView.h | 4 +- genplugouts/uml_projection/UmlView.h | 4 +- genplugouts/uml_projection/hhbox.cpp | 29 + genplugouts/uml_projection/hhbox.h | 22 + genplugouts/uml_projection/uml_projection.pro | 12 +- genplugouts/usecasewizard/CppSettings.cpp | 196 +- genplugouts/usecasewizard/CppSettings.h | 170 +- genplugouts/usecasewizard/IdlSettings.cpp | 188 +- genplugouts/usecasewizard/IdlSettings.h | 160 +- genplugouts/usecasewizard/IdlSettingsCmd.h | 2 +- genplugouts/usecasewizard/JavaSettings.cpp | 142 +- genplugouts/usecasewizard/JavaSettings.h | 112 +- genplugouts/usecasewizard/JavaSettingsCmd.h | 4 +- genplugouts/usecasewizard/PackageGlobalCmd.h | 6 +- genplugouts/usecasewizard/StateBehavior.h | 8 +- genplugouts/usecasewizard/TabDialog.cpp | 55 +- genplugouts/usecasewizard/TabDialog.h | 22 +- .../usecasewizard/TransitionBehavior.h | 8 +- genplugouts/usecasewizard/UmlArtifact.h | 4 +- genplugouts/usecasewizard/UmlAttribute.h | 4 +- genplugouts/usecasewizard/UmlBaseArtifact.cpp | 46 +- genplugouts/usecasewizard/UmlBaseArtifact.h | 42 +- .../usecasewizard/UmlBaseAttribute.cpp | 6 +- genplugouts/usecasewizard/UmlBaseAttribute.h | 14 +- .../usecasewizard/UmlBaseChoicePseudoState.h | 4 +- genplugouts/usecasewizard/UmlBaseClass.cpp | 20 +- genplugouts/usecasewizard/UmlBaseClass.h | 17 +- .../usecasewizard/UmlBaseClassDiagram.h | 4 +- .../usecasewizard/UmlBaseClassItem.cpp | 8 +- genplugouts/usecasewizard/UmlBaseClassItem.h | 16 +- .../usecasewizard/UmlBaseClassMember.h | 4 +- genplugouts/usecasewizard/UmlBaseClassView.h | 4 +- .../UmlBaseCollaborationDiagram.h | 4 +- .../usecasewizard/UmlBaseComponent.cpp | 14 +- genplugouts/usecasewizard/UmlBaseComponent.h | 24 +- .../usecasewizard/UmlBaseComponentDiagram.h | 4 +- .../usecasewizard/UmlBaseComponentView.h | 4 +- .../UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/usecasewizard/UmlBaseDeployment.h | 4 +- .../usecasewizard/UmlBaseDeploymentDiagram.h | 4 +- .../usecasewizard/UmlBaseDeploymentView.h | 4 +- genplugouts/usecasewizard/UmlBaseDiagram.cpp | 4 +- genplugouts/usecasewizard/UmlBaseDiagram.h | 6 +- .../UmlBaseEntryPointPseudoState.h | 4 +- .../UmlBaseExitPointPseudoState.h | 4 +- .../usecasewizard/UmlBaseExtraClassMember.cpp | 4 +- .../usecasewizard/UmlBaseExtraClassMember.h | 8 +- genplugouts/usecasewizard/UmlBaseFinalState.h | 4 +- .../usecasewizard/UmlBaseForkPseudoState.h | 4 +- .../usecasewizard/UmlBaseFormalParameter.h | 10 +- .../usecasewizard/UmlBaseInitialPseudoState.h | 4 +- genplugouts/usecasewizard/UmlBaseItem.cpp | 54 +- genplugouts/usecasewizard/UmlBaseItem.h | 57 +- .../usecasewizard/UmlBaseJoinPseudoState.h | 4 +- .../UmlBaseJunctionPseudoState.h | 4 +- genplugouts/usecasewizard/UmlBaseNcRelation.h | 6 +- genplugouts/usecasewizard/UmlBaseNode.h | 4 +- .../usecasewizard/UmlBaseOperation.cpp | 30 +- genplugouts/usecasewizard/UmlBaseOperation.h | 38 +- genplugouts/usecasewizard/UmlBasePackage.cpp | 44 +- genplugouts/usecasewizard/UmlBasePackage.h | 56 +- genplugouts/usecasewizard/UmlBaseRegion.h | 4 +- genplugouts/usecasewizard/UmlBaseRelation.cpp | 12 +- genplugouts/usecasewizard/UmlBaseRelation.h | 24 +- .../usecasewizard/UmlBaseSequenceDiagram.h | 4 +- .../UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/usecasewizard/UmlBaseState.cpp | 20 +- genplugouts/usecasewizard/UmlBaseState.h | 22 +- .../usecasewizard/UmlBaseStateAction.cpp | 8 +- .../usecasewizard/UmlBaseStateAction.h | 16 +- .../usecasewizard/UmlBaseStateDiagram.h | 4 +- .../UmlBaseTerminatePseudoState.h | 4 +- .../usecasewizard/UmlBaseTransition.cpp | 20 +- genplugouts/usecasewizard/UmlBaseTransition.h | 20 +- genplugouts/usecasewizard/UmlBaseUseCase.cpp | 1 + genplugouts/usecasewizard/UmlBaseUseCase.h | 5 +- .../usecasewizard/UmlBaseUseCaseDiagram.h | 4 +- .../usecasewizard/UmlBaseUseCaseView.h | 4 +- genplugouts/usecasewizard/UmlBuiltin.h | 16 +- genplugouts/usecasewizard/UmlClass.h | 4 +- genplugouts/usecasewizard/UmlClassDiagram.h | 4 +- genplugouts/usecasewizard/UmlClassItem.h | 4 +- genplugouts/usecasewizard/UmlClassMember.h | 4 +- genplugouts/usecasewizard/UmlClassView.h | 4 +- .../usecasewizard/UmlCollaborationDiagram.h | 4 +- genplugouts/usecasewizard/UmlCom.cpp | 36 +- genplugouts/usecasewizard/UmlCom.h | 18 +- genplugouts/usecasewizard/UmlComponent.h | 4 +- .../usecasewizard/UmlComponentDiagram.h | 4 +- genplugouts/usecasewizard/UmlComponentView.h | 4 +- .../usecasewizard/UmlDeploymentDiagram.h | 4 +- genplugouts/usecasewizard/UmlDeploymentView.h | 4 +- genplugouts/usecasewizard/UmlDiagram.h | 4 +- .../usecasewizard/UmlEntryPointPseudoState.h | 4 +- .../usecasewizard/UmlExitPointPseudoState.h | 4 +- .../usecasewizard/UmlExtraClassMember.h | 4 +- genplugouts/usecasewizard/UmlItem.h | 4 +- genplugouts/usecasewizard/UmlNcRelation.h | 4 +- genplugouts/usecasewizard/UmlNode.h | 4 +- genplugouts/usecasewizard/UmlOperation.h | 4 +- genplugouts/usecasewizard/UmlPackage.h | 4 +- genplugouts/usecasewizard/UmlParameter.h | 6 +- genplugouts/usecasewizard/UmlPseudoState.h | 4 +- genplugouts/usecasewizard/UmlRegion.h | 4 +- genplugouts/usecasewizard/UmlRelation.h | 4 +- .../usecasewizard/UmlSequenceDiagram.h | 4 +- genplugouts/usecasewizard/UmlSettings.cpp | 36 +- genplugouts/usecasewizard/UmlSettings.h | 24 +- genplugouts/usecasewizard/UmlState.h | 4 +- genplugouts/usecasewizard/UmlStateDiagram.h | 4 +- genplugouts/usecasewizard/UmlStereotype.h | 10 +- genplugouts/usecasewizard/UmlTypeSpec.cpp | 4 +- genplugouts/usecasewizard/UmlTypeSpec.h | 6 +- genplugouts/usecasewizard/UmlUseCase.cpp | 2 +- genplugouts/usecasewizard/UmlUseCase.h | 4 +- genplugouts/usecasewizard/UmlUseCaseDiagram.h | 4 +- genplugouts/usecasewizard/UmlUseCaseView.h | 4 +- genplugouts/usecasewizard/gridbox.cpp | 37 + genplugouts/usecasewizard/gridbox.h | 26 + .../usecasewizard/tabdialogwrapper.cpp | 80 + genplugouts/usecasewizard/tabdialogwrapper.h | 41 + genplugouts/usecasewizard/usecasewizard.pro | 17 +- genplugouts/usecasewizard/vvbox.cpp | 25 + genplugouts/usecasewizard/vvbox.h | 22 + genplugouts/xmi/CppSettings.cpp | 208 +- genplugouts/xmi/CppSettings.h | 182 +- genplugouts/xmi/Dialog.cpp | 105 +- genplugouts/xmi/Dialog.h | 10 +- genplugouts/xmi/FileOut.cpp | 46 +- genplugouts/xmi/FileOut.h | 14 +- genplugouts/xmi/IdlSettings.cpp | 186 +- genplugouts/xmi/IdlSettings.h | 160 +- genplugouts/xmi/JavaSettings.cpp | 150 +- genplugouts/xmi/JavaSettings.h | 124 +- genplugouts/xmi/StateBehavior.h | 8 +- genplugouts/xmi/TransitionBehavior.h | 8 +- genplugouts/xmi/UmlArtifact.h | 4 +- genplugouts/xmi/UmlAttribute.cpp | 34 +- genplugouts/xmi/UmlAttribute.h | 4 +- genplugouts/xmi/UmlBaseArtifact.cpp | 46 +- genplugouts/xmi/UmlBaseArtifact.h | 42 +- genplugouts/xmi/UmlBaseAttribute.cpp | 6 +- genplugouts/xmi/UmlBaseAttribute.h | 14 +- genplugouts/xmi/UmlBaseChoicePseudoState.h | 4 +- genplugouts/xmi/UmlBaseClass.cpp | 32 +- genplugouts/xmi/UmlBaseClass.h | 22 +- genplugouts/xmi/UmlBaseClassDiagram.h | 4 +- genplugouts/xmi/UmlBaseClassItem.cpp | 8 +- genplugouts/xmi/UmlBaseClassItem.h | 16 +- genplugouts/xmi/UmlBaseClassMember.cpp | 4 +- genplugouts/xmi/UmlBaseClassMember.h | 8 +- genplugouts/xmi/UmlBaseClassView.h | 4 +- genplugouts/xmi/UmlBaseCollaborationDiagram.h | 4 +- genplugouts/xmi/UmlBaseComponent.cpp | 14 +- genplugouts/xmi/UmlBaseComponent.h | 23 +- genplugouts/xmi/UmlBaseComponentDiagram.h | 4 +- genplugouts/xmi/UmlBaseComponentView.h | 4 +- .../xmi/UmlBaseDeepHistoryPseudoState.h | 4 +- genplugouts/xmi/UmlBaseDeployment.h | 4 +- genplugouts/xmi/UmlBaseDeploymentDiagram.h | 4 +- genplugouts/xmi/UmlBaseDeploymentView.h | 4 +- genplugouts/xmi/UmlBaseDiagram.cpp | 4 +- genplugouts/xmi/UmlBaseDiagram.h | 6 +- .../xmi/UmlBaseEntryPointPseudoState.h | 4 +- genplugouts/xmi/UmlBaseExitPointPseudoState.h | 4 +- genplugouts/xmi/UmlBaseExtraClassMember.cpp | 4 +- genplugouts/xmi/UmlBaseExtraClassMember.h | 8 +- genplugouts/xmi/UmlBaseFinalState.h | 4 +- genplugouts/xmi/UmlBaseForkPseudoState.h | 4 +- genplugouts/xmi/UmlBaseFormalParameter.h | 10 +- genplugouts/xmi/UmlBaseInitialPseudoState.h | 4 +- genplugouts/xmi/UmlBaseItem.cpp | 54 +- genplugouts/xmi/UmlBaseItem.h | 52 +- genplugouts/xmi/UmlBaseJoinPseudoState.h | 4 +- genplugouts/xmi/UmlBaseJunctionPseudoState.h | 4 +- genplugouts/xmi/UmlBaseNcRelation.h | 6 +- genplugouts/xmi/UmlBaseNode.h | 4 +- genplugouts/xmi/UmlBaseOperation.cpp | 30 +- genplugouts/xmi/UmlBaseOperation.h | 38 +- genplugouts/xmi/UmlBasePackage.cpp | 38 +- genplugouts/xmi/UmlBasePackage.h | 56 +- genplugouts/xmi/UmlBaseRegion.h | 4 +- genplugouts/xmi/UmlBaseRelation.cpp | 12 +- genplugouts/xmi/UmlBaseRelation.h | 24 +- genplugouts/xmi/UmlBaseSequenceDiagram.h | 4 +- .../xmi/UmlBaseShallowHistoryPseudoState.h | 4 +- genplugouts/xmi/UmlBaseState.cpp | 20 +- genplugouts/xmi/UmlBaseState.h | 22 +- genplugouts/xmi/UmlBaseStateAction.cpp | 8 +- genplugouts/xmi/UmlBaseStateAction.h | 16 +- genplugouts/xmi/UmlBaseStateDiagram.h | 4 +- genplugouts/xmi/UmlBaseTerminatePseudoState.h | 4 +- genplugouts/xmi/UmlBaseTransition.cpp | 20 +- genplugouts/xmi/UmlBaseTransition.h | 22 +- genplugouts/xmi/UmlBaseUseCase.cpp | 1 + genplugouts/xmi/UmlBaseUseCase.h | 5 +- genplugouts/xmi/UmlBaseUseCaseDiagram.h | 4 +- genplugouts/xmi/UmlBaseUseCaseView.h | 4 +- genplugouts/xmi/UmlBuiltin.h | 18 +- genplugouts/xmi/UmlClass.cpp | 4 +- genplugouts/xmi/UmlClass.h | 4 +- genplugouts/xmi/UmlClassDiagram.h | 4 +- genplugouts/xmi/UmlClassItem.h | 4 +- genplugouts/xmi/UmlClassMember.cpp | 50 +- genplugouts/xmi/UmlClassMember.h | 10 +- genplugouts/xmi/UmlClassView.cpp | 2 +- genplugouts/xmi/UmlClassView.h | 4 +- genplugouts/xmi/UmlCollaborationDiagram.h | 4 +- genplugouts/xmi/UmlCom.cpp | 35 +- genplugouts/xmi/UmlCom.h | 18 +- genplugouts/xmi/UmlComponent.cpp | 2 +- genplugouts/xmi/UmlComponent.h | 4 +- genplugouts/xmi/UmlComponentDiagram.h | 4 +- genplugouts/xmi/UmlComponentView.cpp | 2 +- genplugouts/xmi/UmlComponentView.h | 4 +- genplugouts/xmi/UmlDeploymentDiagram.h | 4 +- genplugouts/xmi/UmlDeploymentView.cpp | 2 +- genplugouts/xmi/UmlDeploymentView.h | 4 +- genplugouts/xmi/UmlDiagram.h | 4 +- genplugouts/xmi/UmlEntryPointPseudoState.h | 4 +- genplugouts/xmi/UmlExitPointPseudoState.h | 4 +- genplugouts/xmi/UmlExtraClassMember.h | 4 +- genplugouts/xmi/UmlItem.cpp | 21 +- genplugouts/xmi/UmlItem.h | 4 +- genplugouts/xmi/UmlNcRelation.h | 4 +- genplugouts/xmi/UmlNode.cpp | 2 +- genplugouts/xmi/UmlNode.h | 4 +- genplugouts/xmi/UmlOperation.cpp | 70 +- genplugouts/xmi/UmlOperation.h | 14 +- genplugouts/xmi/UmlPackage.cpp | 14 +- genplugouts/xmi/UmlPackage.h | 4 +- genplugouts/xmi/UmlParameter.h | 6 +- genplugouts/xmi/UmlPseudoState.h | 4 +- genplugouts/xmi/UmlRegion.h | 4 +- genplugouts/xmi/UmlRelation.cpp | 14 +- genplugouts/xmi/UmlRelation.h | 4 +- genplugouts/xmi/UmlSequenceDiagram.h | 4 +- genplugouts/xmi/UmlSettings.cpp | 66 +- genplugouts/xmi/UmlSettings.h | 54 +- genplugouts/xmi/UmlState.h | 4 +- genplugouts/xmi/UmlStateDiagram.h | 4 +- genplugouts/xmi/UmlStereotype.h | 10 +- genplugouts/xmi/UmlTransition.h | 4 +- genplugouts/xmi/UmlTypeSpec.cpp | 4 +- genplugouts/xmi/UmlTypeSpec.h | 6 +- genplugouts/xmi/UmlUseCase.cpp | 2 +- genplugouts/xmi/UmlUseCase.h | 4 +- genplugouts/xmi/UmlUseCaseDiagram.h | 4 +- genplugouts/xmi/UmlUseCaseView.cpp | 2 +- genplugouts/xmi/UmlUseCaseView.h | 4 +- genplugouts/xmi/bbuttongroup.cpp | 65 + genplugouts/xmi/bbuttongroup.h | 26 + genplugouts/xmi/hhbox.cpp | 29 + genplugouts/xmi/hhbox.h | 22 + genplugouts/xmi/xmi.pro | 15 +- genplugouts/xmi2import/Binding.cpp | 8 +- genplugouts/xmi2import/Binding.h | 4 +- genplugouts/xmi2import/ClassInstance.cpp | 14 +- genplugouts/xmi2import/ClassInstance.h | 11 +- genplugouts/xmi2import/CppSettings.cpp | 32 +- genplugouts/xmi2import/CppSettings.h | 4 +- genplugouts/xmi2import/FileIn.cpp | 12 +- genplugouts/xmi2import/FileIn.h | 9 +- genplugouts/xmi2import/IdlSettings.cpp | 16 +- genplugouts/xmi2import/IdlSettings.h | 4 +- genplugouts/xmi2import/JavaSettings.cpp | 16 +- genplugouts/xmi2import/JavaSettings.h | 4 +- genplugouts/xmi2import/Manifestation.cpp | 6 +- genplugouts/xmi2import/Manifestation.h | 4 +- genplugouts/xmi2import/PhpSettings.cpp | 4 +- genplugouts/xmi2import/PythonSettings.cpp | 12 +- genplugouts/xmi2import/PythonSettings.h | 4 +- genplugouts/xmi2import/SlotAttribute.h | 2 +- genplugouts/xmi2import/Token.cpp | 6 +- genplugouts/xmi2import/Token.h | 4 +- genplugouts/xmi2import/UmlActivity.cpp | 4 +- genplugouts/xmi2import/UmlBaseArtifact.cpp | 30 +- genplugouts/xmi2import/UmlBaseArtifact.h | 12 +- genplugouts/xmi2import/UmlBaseClass.cpp | 24 +- genplugouts/xmi2import/UmlBaseClass.h | 15 +- .../xmi2import/UmlBaseClassInstance.cpp | 18 +- genplugouts/xmi2import/UmlBaseClassInstance.h | 12 +- .../UmlBaseClassInstanceReference.h | 2 +- .../UmlBaseCollaborationDiagramDefinition.cpp | 6 +- .../UmlBaseCollaborationDiagramDefinition.h | 12 +- .../UmlBaseCollaborationMessage.cpp | 2 +- .../xmi2import/UmlBaseCollaborationMessage.h | 4 +- genplugouts/xmi2import/UmlBaseComponent.cpp | 14 +- genplugouts/xmi2import/UmlBaseComponent.h | 18 +- genplugouts/xmi2import/UmlBaseFragment.cpp | 8 +- genplugouts/xmi2import/UmlBaseFragment.h | 21 +- .../xmi2import/UmlBaseFragmentCompartment.cpp | 5 +- .../xmi2import/UmlBaseFragmentCompartment.h | 10 +- genplugouts/xmi2import/UmlBaseItem.cpp | 18 +- genplugouts/xmi2import/UmlBaseItem.h | 23 +- genplugouts/xmi2import/UmlBaseMessage.cpp | 2 +- genplugouts/xmi2import/UmlBaseMessage.h | 6 +- genplugouts/xmi2import/UmlBaseOperation.cpp | 10 +- genplugouts/xmi2import/UmlBaseOperation.h | 10 +- .../xmi2import/UmlBaseParameterSet.cpp | 8 +- genplugouts/xmi2import/UmlBaseParameterSet.h | 10 +- .../UmlBaseSequenceDiagramDefinition.cpp | 8 +- .../UmlBaseSequenceDiagramDefinition.h | 14 +- .../xmi2import/UmlBaseSequenceMessage.cpp | 2 +- .../xmi2import/UmlBaseSequenceMessage.h | 6 +- genplugouts/xmi2import/UmlBaseSubject.cpp | 2 +- genplugouts/xmi2import/UmlBaseSubject.h | 4 +- genplugouts/xmi2import/UmlBaseTypeSpec.h | 2 +- .../xmi2import/UmlBaseUseCaseAssociation.cpp | 2 +- .../xmi2import/UmlBaseUseCaseAssociation.h | 6 +- .../UmlBaseUseCaseDiagramDefinition.cpp | 10 +- .../UmlBaseUseCaseDiagramDefinition.h | 22 +- .../xmi2import/UmlBaseUseCaseReference.cpp | 2 +- .../xmi2import/UmlBaseUseCaseReference.h | 4 +- genplugouts/xmi2import/UmlBuiltin.h | 1 + genplugouts/xmi2import/UmlClass.cpp | 26 +- genplugouts/xmi2import/UmlClass.h | 6 +- genplugouts/xmi2import/UmlCom.cpp | 32 +- genplugouts/xmi2import/UmlCom.h | 14 +- genplugouts/xmi2import/UmlComponent.cpp | 12 +- genplugouts/xmi2import/UmlFlow.cpp | 9 +- genplugouts/xmi2import/UmlFlow.h | 4 +- genplugouts/xmi2import/UmlItem.cpp | 18 +- genplugouts/xmi2import/UmlItem.h | 10 +- genplugouts/xmi2import/UmlPackage.cpp | 34 +- genplugouts/xmi2import/UmlSettings.cpp | 24 +- genplugouts/xmi2import/UmlSettings.h | 12 +- genplugouts/xmi2import/UmlTransition.cpp | 9 +- genplugouts/xmi2import/UmlTransition.h | 4 +- genplugouts/xmi2import/xmi2import.pro | 8 +- plugouts/cpp_utilities/128002 | 165 +- plugouts/cpp_utilities/129.diagram | 139 +- plugouts/cpp_utilities/132738.bodies | 424 +- plugouts/cpp_utilities/135682 | 900 ++ plugouts/cpp_utilities/135810 | 58 + plugouts/cpp_utilities/158210.bodies | 4 + plugouts/cpp_utilities/158850.bodies | 8 + plugouts/cpp_utilities/158978.bodies | 3 + plugouts/cpp_utilities/159234.bodies | 26 + plugouts/cpp_utilities/159490.bodies | 20 + plugouts/cpp_utilities/159746.bodies | 18 + plugouts/cpp_utilities/159874.bodies | 20 + plugouts/cpp_utilities/160002.bodies | 22 + plugouts/cpp_utilities/160258.bodies | 5 + plugouts/cpp_utilities/2.session | 651 ++ plugouts/cpp_utilities/641 | 9020 +++++++++-------- plugouts/cpp_utilities/7169.bodies | 428 +- plugouts/cpp_utilities/8833.bodies | 6 +- plugouts/cpp_utilities/cpp_utilities.prj | 690 +- plugouts/cpp_utilities/generation_settings | 4 +- plugouts/cpp_utilities/stereotypes | 1 + src/CppGenerator/CppGenerator.pro | 91 +- src/CppGenerator/CppRefType.cpp | 8 +- src/CppGenerator/CppRefType.h | 4 +- src/CppGenerator/UmlArtifact.cpp | 8 +- src/CppGenerator/UmlAttribute.cpp | 2 +- src/CppGenerator/UmlAttribute.h | 1 - src/CppGenerator/UmlClass.cpp | 48 +- src/CppGenerator/UmlClass.h | 10 +- src/CppGenerator/UmlClassItem.h | 4 +- src/CppGenerator/UmlClassMember.cpp | 2 +- src/CppGenerator/UmlClassMember.h | 1 - src/CppGenerator/UmlClassView.cpp | 2 +- src/CppGenerator/UmlDeploymentView.cpp | 2 +- src/CppGenerator/UmlExtraClassMember.cpp | 2 +- src/CppGenerator/UmlExtraClassMember.h | 1 - src/CppGenerator/UmlItem.cpp | 7 +- src/CppGenerator/UmlOperation.cpp | 34 +- src/CppGenerator/UmlOperation.h | 4 - src/CppGenerator/UmlPackage.cpp | 14 +- src/CppGenerator/UmlRelation.cpp | 12 +- src/CppGenerator/UmlRelation.h | 6 +- src/CppGenerator/main.cpp | 11 +- src/CppGenerator/util.cpp | 18 +- src/CppReverse/BrowserNode.h | 6 +- src/CppReverse/Class.cpp | 48 +- src/CppReverse/Class.h | 10 +- src/CppReverse/ClassContainer.cpp | 10 +- src/CppReverse/ClassContainer.h | 8 +- src/CppReverse/CppReverse.pro | 8 +- src/CppReverse/Lex.cpp | 32 +- src/CppReverse/Lex.h | 4 +- src/CppReverse/Namespace.cpp | 12 +- src/CppReverse/Namespace.h | 17 +- src/CppReverse/Package.cpp | 92 +- src/CppReverse/Package.h | 11 +- src/CppReverse/Progress.cpp | 5 +- src/CppReverse/Progress.h | 4 +- src/CppReverse/TreeItem.h | 3 +- src/CppReverse/UmlArtifact.cpp | 9 +- src/CppReverse/UmlArtifact.h | 2 - src/CppReverse/UmlAttribute.cpp | 2 +- src/CppReverse/UmlAttribute.h | 2 - src/CppReverse/UmlClass.cpp | 124 +- src/CppReverse/UmlClass.h | 15 +- src/CppReverse/UmlClassItem.cpp | 1 - src/CppReverse/UmlClassItem.h | 4 - src/CppReverse/UmlClassView.cpp | 57 +- src/CppReverse/UmlClassView.h | 2 - src/CppReverse/UmlDeploymentView.cpp | 16 +- src/CppReverse/UmlDeploymentView.h | 2 - src/CppReverse/UmlItem.cpp | 2 +- src/CppReverse/UmlItem.h | 3 - src/CppReverse/UmlOperation.cpp | 229 +- src/CppReverse/UmlOperation.h | 28 +- src/CppReverse/UmlPackage.cpp | 32 +- src/CppReverse/UmlPackage.h | 1 - src/CppReverse/UmlRelation.cpp | 10 +- src/CppReverse/UmlRelation.h | 2 - src/CppReverse/main.cpp | 7 +- src/CppRoundtrip/CppRoundtrip.pro | 8 +- src/CppRoundtrip/main.cpp | 14 +- src/CustomWidgets/EdgeMenuToolBar.cpp | 1 + src/CustomWidgets/MultiPurposeDragArea.cpp | 2 +- src/CustomWidgets/MultiPurposeDragArea.h | 2 +- src/CustomWidgets/quickedit.cpp | 24 +- src/CustomWidgets/quickedit.h | 9 +- .../quickeditcontrollersetup.cpp | 4 +- src/Factories/DialogConnections.h | 4 + src/Factories/EdgeMenuFactory.cpp | 3 +- src/Factories/EdgeToolBarCreation.cpp | 53 +- src/Factories/EdgeToolBarCreation.h | 2 +- src/IdlGenerator/IdlGenerator.pro | 5 +- src/IdlGenerator/UmlArtifact.cpp | 4 +- src/IdlGenerator/UmlClass.cpp | 12 +- src/IdlGenerator/UmlClass.h | 3 - src/IdlGenerator/UmlClassItem.h | 4 - src/IdlGenerator/UmlClassView.cpp | 2 +- src/IdlGenerator/UmlDeploymentView.cpp | 2 +- src/IdlGenerator/UmlItem.cpp | 8 +- src/IdlGenerator/UmlOperation.cpp | 18 +- src/IdlGenerator/UmlPackage.cpp | 8 +- src/IdlGenerator/main.cpp | 2 +- src/IdlGenerator/util.cpp | 2 +- src/JavaCat/BrowserNode.cpp | 60 +- src/JavaCat/BrowserNode.h | 9 +- src/JavaCat/BrowserSearchDialog.cpp | 48 +- src/JavaCat/BrowserSearchDialog.h | 6 +- src/JavaCat/BrowserView.cpp | 26 +- src/JavaCat/BrowserView.h | 10 +- src/JavaCat/Class.cpp | 169 +- src/JavaCat/Class.h | 18 +- src/JavaCat/ClassContainer.cpp | 6 +- src/JavaCat/ClassContainer.h | 12 +- src/JavaCat/CommentView.cpp | 2 +- src/JavaCat/CommentView.h | 4 +- src/JavaCat/JavaCat.pro | 14 +- src/JavaCat/JavaCatWindow.cpp | 193 +- src/JavaCat/JavaCatWindow.h | 6 +- src/JavaCat/Lex.cpp | 24 +- src/JavaCat/Package.cpp | 164 +- src/JavaCat/Package.h | 22 +- src/JavaCat/Progress.cpp | 5 +- src/JavaCat/Progress.h | 4 +- src/JavaCat/ShowFileDialog.cpp | 17 +- src/JavaCat/ShowFileDialog.h | 4 +- src/JavaCat/TreeItem.h | 9 +- src/JavaCat/UmlArtifact.cpp | 8 +- src/JavaCat/UmlArtifact.h | 2 +- src/JavaCat/UmlAttribute.cpp | 2 +- src/JavaCat/UmlAttribute.h | 2 - src/JavaCat/UmlClass.cpp | 26 +- src/JavaCat/UmlClass.h | 2 - src/JavaCat/UmlClassItem.cpp | 2 +- src/JavaCat/UmlClassItem.h | 5 - src/JavaCat/UmlClassView.cpp | 50 +- src/JavaCat/UmlClassView.h | 2 +- src/JavaCat/UmlDeploymentView.cpp | 16 +- src/JavaCat/UmlDeploymentView.h | 2 +- src/JavaCat/UmlExtraClassMember.cpp | 8 +- src/JavaCat/UmlExtraClassMember.h | 2 +- src/JavaCat/UmlFormalParameter.h | 5 +- src/JavaCat/UmlItem.cpp | 2 +- src/JavaCat/UmlItem.h | 5 +- src/JavaCat/UmlOperation.cpp | 52 +- src/JavaCat/UmlOperation.h | 10 +- src/JavaCat/UmlPackage.cpp | 40 +- src/JavaCat/UmlPackage.h | 2 - src/JavaCat/UmlRelation.cpp | 4 +- src/JavaCat/UmlRelation.h | 4 +- src/JavaCat/menufactory.cpp | 130 + src/JavaCat/menufactory.h | 88 + src/JavaGenerator/JavaGenerator.pro | 6 +- src/JavaGenerator/UmlArtifact.cpp | 10 +- src/JavaGenerator/UmlArtifact.h | 5 +- src/JavaGenerator/UmlAttribute.cpp | 2 +- src/JavaGenerator/UmlClass.cpp | 16 +- src/JavaGenerator/UmlClass.h | 2 +- src/JavaGenerator/UmlClassItem.h | 2 +- src/JavaGenerator/UmlClassView.cpp | 2 +- src/JavaGenerator/UmlDeploymentView.cpp | 2 +- src/JavaGenerator/UmlItem.cpp | 12 +- src/JavaGenerator/UmlOperation.cpp | 33 +- src/JavaGenerator/UmlOperation.h | 6 +- src/JavaGenerator/UmlPackage.cpp | 8 +- src/JavaGenerator/UmlRelation.cpp | 12 +- src/JavaGenerator/UmlRelation.h | 6 +- src/JavaGenerator/main.cpp | 2 +- src/JavaGenerator/util.cpp | 2 +- src/JavaReverse/JavaReverse.pro | 6 +- src/JavaReverse/main.cpp | 34 +- src/JavaRoundtrip/JavaRoundtrip.pro | 6 +- src/JavaRoundtrip/Statistic.cpp | 12 +- src/JavaRoundtrip/main.cpp | 24 +- .../L_UniversalModels/L_UniversalModels.pro | 1 + .../include/TableDataInterface.h | 2 +- .../include/TableDataListHolder.h | 2 +- .../src/AdaptingTableModel.cpp | 4 +- src/Libs/L_UniversalModels/src/TreeModel.cpp | 4 +- src/PhpGenerator/PhpGenerator.pro | 6 +- src/PhpGenerator/UmlArtifact.cpp | 2 +- src/PhpGenerator/UmlArtifact.h | 3 - src/PhpGenerator/UmlClass.cpp | 12 +- src/PhpGenerator/UmlClass.h | 2 +- src/PhpGenerator/UmlClassItem.h | 2 +- src/PhpGenerator/UmlClassView.cpp | 2 +- src/PhpGenerator/UmlDeploymentView.cpp | 2 +- src/PhpGenerator/UmlItem.cpp | 10 +- src/PhpGenerator/UmlOperation.cpp | 34 +- src/PhpGenerator/UmlOperation.h | 6 +- src/PhpGenerator/UmlPackage.cpp | 12 +- src/PhpGenerator/main.cpp | 2 +- src/PhpGenerator/util.cpp | 2 +- src/PhpReverse/BrowserNode.h | 6 +- src/PhpReverse/Class.cpp | 14 +- src/PhpReverse/Class.h | 2 +- src/PhpReverse/ClassContainer.h | 4 +- src/PhpReverse/Lex.cpp | 24 +- src/PhpReverse/Namespace.cpp | 2 +- src/PhpReverse/Namespace.h | 20 +- src/PhpReverse/Package.cpp | 42 +- src/PhpReverse/PhpReverse.pro | 7 +- src/PhpReverse/Progress.cpp | 5 +- src/PhpReverse/Progress.h | 4 +- src/PhpReverse/TreeItem.h | 2 +- src/PhpReverse/UmlClassItem.h | 2 +- src/PhpReverse/UmlFormalParameter.h | 4 +- src/PhpReverse/UmlOperation.cpp | 6 +- src/PhpReverse/UmlPackage.cpp | 4 +- src/PhpReverse/UmlRelation.h | 2 +- src/PhpReverse/main.cpp | 4 +- src/PlugOutUpgrade/UmlClass.h | 2 +- src/PlugOutUpgrade/UmlClassItem.h | 2 +- src/PlugOutUpgrade/UmlOperation.cpp | 14 +- src/PlugOutUpgrade/UmlPackage.cpp | 8 +- src/PlugOutUpgrade/activity.cpp | 4 +- src/PlugOutUpgrade/instance.cpp | 4 +- src/ProjectControl/BrowserNode.cpp | 2 +- src/ProjectControl/BrowserNode.h | 6 +- src/ProjectSynchro/BrowserNode.h | 2 +- src/ProjectSynchro/BrowserView.cpp | 2 +- src/ProjectSynchro/BrowserView.h | 4 +- src/ProjectSynchro/SynchroDialog.cpp | 2 +- src/ProjectSynchro/SynchroDialog.h | 4 +- src/ProjectSynchro/SynchroWindow.h | 4 +- src/ProjectSynchro/myio.h | 2 +- src/ProjectSynchro/projectsynchro.pro | 3 +- src/PythonGenerator/PythonGenerator.pro | 7 +- src/PythonGenerator/UmlArtifact.cpp | 4 +- src/PythonGenerator/UmlArtifact.h | 3 - src/PythonGenerator/UmlClass.cpp | 10 +- src/PythonGenerator/UmlClass.h | 2 +- src/PythonGenerator/UmlClassItem.h | 2 +- src/PythonGenerator/UmlClassView.cpp | 2 +- src/PythonGenerator/UmlDeploymentView.cpp | 2 +- src/PythonGenerator/UmlItem.cpp | 2 +- src/PythonGenerator/UmlOperation.cpp | 37 +- src/PythonGenerator/UmlOperation.h | 6 +- src/PythonGenerator/UmlPackage.cpp | 8 +- src/PythonGenerator/main.cpp | 2 +- src/RoundtripBody/RoundtripBody.pro | 7 +- src/RoundtripBody/UmlDeploymentView.cpp | 8 +- src/RoundtripBody/UmlOperation.cpp | 2 +- src/RoundtripBody/UmlPackage.cpp | 20 +- src/RoundtripBody/main.cpp | 2 +- src/Tools/CppSettings.cpp | 46 +- src/Tools/CppSettings.h | 3 +- src/Tools/IdlSettings.cpp | 16 +- src/Tools/IdlSettings.h | 4 +- src/Tools/JavaSettings.cpp | 16 +- src/Tools/JavaSettings.h | 4 +- src/Tools/PhpSettings.cpp | 4 +- src/Tools/PhpSettings.h | 2 +- src/Tools/PythonSettings.cpp | 12 +- src/Tools/PythonSettings.h | 4 +- src/Tools/SignalBlockerWrapper.h | 10 +- src/Tools/UmlBaseArtifact.cpp | 24 +- src/Tools/UmlBaseArtifact.h | 11 +- src/Tools/UmlBaseClass.cpp | 23 +- src/Tools/UmlBaseClass.h | 14 +- src/Tools/UmlBaseClassInstance.cpp | 18 +- src/Tools/UmlBaseClassInstance.h | 11 +- src/Tools/UmlBaseClassItem.h | 2 +- src/Tools/UmlBaseComponent.cpp | 14 +- src/Tools/UmlBaseComponent.h | 15 +- src/Tools/UmlBaseItem.cpp | 138 +- src/Tools/UmlBaseItem.h | 22 +- src/Tools/UmlBaseOperation.cpp | 19 +- src/Tools/UmlBaseOperation.h | 11 +- src/Tools/UmlBasePackage.cpp | 2 - src/Tools/UmlBasePackage.h | 2 +- src/Tools/UmlBaseParameterSet.cpp | 10 +- src/Tools/UmlBaseParameterSet.h | 8 +- src/Tools/UmlCom.cpp | 93 +- src/Tools/UmlCom.h | 14 +- src/Tools/UmlSettings.cpp | 24 +- src/Tools/UmlSettings.h | 7 +- src/browser/BrowserActivity.cpp | 269 +- src/browser/BrowserActivity.h | 4 +- src/browser/BrowserActivityAction.cpp | 310 +- src/browser/BrowserActivityAction.h | 6 +- src/browser/BrowserActivityDiagram.cpp | 115 +- src/browser/BrowserActivityDiagram.h | 7 +- src/browser/BrowserActivityNode.cpp | 99 +- src/browser/BrowserActivityObject.cpp | 186 +- src/browser/BrowserActivityPartition.cpp | 182 +- src/browser/BrowserArtifact.cpp | 398 +- src/browser/BrowserArtifact.h | 8 +- src/browser/BrowserAttribute.cpp | 132 +- src/browser/BrowserAttribute.h | 3 +- src/browser/BrowserClass.cpp | 843 +- src/browser/BrowserClass.h | 21 +- src/browser/BrowserClassDiagram.cpp | 74 +- src/browser/BrowserClassDiagram.h | 5 +- src/browser/BrowserClassInstance.cpp | 219 +- src/browser/BrowserClassView.cpp | 192 +- src/browser/BrowserClassView.h | 3 +- src/browser/BrowserColDiagram.cpp | 143 +- src/browser/BrowserColDiagram.h | 6 +- src/browser/BrowserComponent.cpp | 328 +- src/browser/BrowserComponent.h | 28 +- src/browser/BrowserComponentDiagram.cpp | 147 +- src/browser/BrowserComponentDiagram.h | 6 +- src/browser/BrowserComponentView.cpp | 101 +- src/browser/BrowserComponentView.h | 3 +- src/browser/BrowserDeploymentDiagram.cpp | 160 +- src/browser/BrowserDeploymentDiagram.h | 6 +- src/browser/BrowserDeploymentNode.cpp | 134 +- src/browser/BrowserDeploymentView.cpp | 147 +- src/browser/BrowserDeploymentView.h | 3 +- src/browser/BrowserDiagram.cpp | 13 +- src/browser/BrowserDiagram.h | 2 +- src/browser/BrowserExpansionNode.cpp | 130 +- src/browser/BrowserExpansionRegion.cpp | 119 +- src/browser/BrowserExpansionRegion.h | 4 +- src/browser/BrowserExtraMember.cpp | 49 +- src/browser/BrowserFlow.cpp | 107 +- .../BrowserInterruptibleActivityRegion.cpp | 205 +- src/browser/BrowserNode.cpp | 592 +- src/browser/BrowserNode.h | 66 +- src/browser/BrowserNodeDummy.h | 5 +- src/browser/BrowserObjectDiagram.cpp | 162 +- src/browser/BrowserObjectDiagram.h | 6 +- src/browser/BrowserOperation.cpp | 237 +- src/browser/BrowserOperation.h | 3 +- src/browser/BrowserOperationAttribute.cpp | 8 +- src/browser/BrowserOperationAttribute.h | 1 + src/browser/BrowserPackage.cpp | 745 +- src/browser/BrowserPackage.h | 13 +- src/browser/BrowserParameter.cpp | 129 +- src/browser/BrowserParameterSet.cpp | 47 +- src/browser/BrowserPin.cpp | 80 +- src/browser/BrowserPseudoState.cpp | 98 +- src/browser/BrowserRegion.cpp | 79 +- src/browser/BrowserRelation.cpp | 302 +- src/browser/BrowserRelation.h | 5 +- src/browser/BrowserSeqDiagram.cpp | 145 +- src/browser/BrowserSeqDiagram.h | 4 +- src/browser/BrowserSimpleRelation.cpp | 94 +- src/browser/BrowserSimpleRelation.h | 2 +- src/browser/BrowserState.cpp | 315 +- src/browser/BrowserStateAction.cpp | 68 +- src/browser/BrowserStateDiagram.cpp | 157 +- src/browser/BrowserStateDiagram.h | 6 +- src/browser/BrowserTransition.cpp | 77 +- src/browser/BrowserUseCase.cpp | 322 +- src/browser/BrowserUseCaseDiagram.cpp | 168 +- src/browser/BrowserUseCaseDiagram.h | 6 +- src/browser/BrowserUseCaseView.cpp | 321 +- src/browser/BrowserUseCaseView.h | 4 +- src/browserfunctions/operationfuncs.cpp | 30 +- src/data/AType.cpp | 9 +- src/data/ActivityActionData.cpp | 92 +- src/data/ActivityActionData.h | 44 +- src/data/ActivityData.cpp | 4 +- src/data/ActivityObjectData.cpp | 3 +- src/data/ArtifactData.cpp | 136 +- src/data/ArtifactData.h | 8 +- src/data/AttributeData.cpp | 27 +- src/data/BasicData.cpp | 4 +- src/data/BasicData.h | 14 +- src/data/ClassData.cpp | 22 +- src/data/ClassData.h | 2 +- src/data/ClassInstanceData.cpp | 68 +- src/data/ClassInstanceData.h | 14 +- src/data/ExpansionRegionData.cpp | 2 +- src/data/ExtraMemberData.cpp | 3 +- src/data/HaveKeyValueData.cpp | 2 - src/data/OperationData.cpp | 507 +- src/data/OperationData.h | 3 +- src/data/PackageData.cpp | 2 +- src/data/ParamData.cpp | 2 +- src/data/ParameterData.cpp | 3 +- src/data/ParameterSetData.cpp | 21 +- src/data/ParameterSetData.h | 8 +- src/data/PinData.cpp | 2 +- src/data/PseudoStateData.cpp | 2 +- src/data/PseudoStateData.h | 4 - src/data/RelationData.cpp | 103 +- src/data/RelationData.h | 4 - src/data/StateData.cpp | 3 +- src/data/StateData.h | 2 +- src/data/UseCaseData.cpp | 3 +- src/data/UseCaseData.h | 4 - src/diagram/ActivityActionCanvas.cpp | 168 +- src/diagram/ActivityActionCanvas.h | 13 +- src/diagram/ActivityCanvas.cpp | 265 +- src/diagram/ActivityCanvas.h | 11 +- src/diagram/ActivityContainerCanvas.cpp | 64 +- src/diagram/ActivityContainerCanvas.h | 8 +- src/diagram/ActivityDiagramView.cpp | 150 +- src/diagram/ActivityDiagramView.h | 3 +- src/diagram/ActivityDiagramWindow.cpp | 222 +- src/diagram/ActivityNodeCanvas.cpp | 221 +- src/diagram/ActivityNodeCanvas.h | 3 +- src/diagram/ActivityObjectCanvas.cpp | 88 +- src/diagram/ActivityObjectCanvas.h | 3 +- src/diagram/ActivityPartitionCanvas.cpp | 260 +- src/diagram/ActivityPartitionCanvas.h | 7 +- src/diagram/ArrowCanvas.cpp | 371 +- src/diagram/ArrowCanvas.h | 29 +- src/diagram/ArrowJunctionCanvas.cpp | 21 +- src/diagram/ArrowJunctionCanvas.h | 3 +- src/diagram/ArrowPointCanvas.cpp | 65 +- src/diagram/ArrowPointCanvas.h | 4 +- src/diagram/ArtifactCanvas.cpp | 358 +- src/diagram/ArtifactCanvas.h | 3 +- src/diagram/AssocContainCanvas.cpp | 160 +- src/diagram/BrowserView.cpp | 228 +- src/diagram/BrowserView.h | 40 +- src/diagram/CdClassCanvas.cpp | 235 +- src/diagram/CdClassCanvas.h | 9 +- src/diagram/ClassDiagramView.cpp | 115 +- src/diagram/ClassDiagramView.h | 13 +- src/diagram/ClassDiagramWindow.cpp | 182 +- src/diagram/ClassInstCanvas.cpp | 11 +- src/diagram/CodClassInstCanvas.cpp | 78 +- src/diagram/CodClassInstCanvas.h | 5 +- src/diagram/CodDirsCanvas.cpp | 32 +- src/diagram/CodDirsCanvas.h | 6 +- src/diagram/CodLinkCanvas.cpp | 178 +- src/diagram/CodObjCanvas.cpp | 14 +- src/diagram/CodSelfLinkCanvas.cpp | 51 +- src/diagram/CodSelfLinkCanvas.h | 3 +- src/diagram/ColDiagramView.cpp | 73 +- src/diagram/ColDiagramView.h | 3 +- src/diagram/ColDiagramWindow.cpp | 113 +- src/diagram/ColMsg.cpp | 22 +- src/diagram/ColMsg.h | 4 +- src/diagram/ComponentCanvas.cpp | 165 +- src/diagram/ComponentCanvas.h | 3 +- src/diagram/ComponentDiagramView.cpp | 84 +- src/diagram/ComponentDiagramView.h | 8 +- src/diagram/ComponentDiagramWindow.cpp | 124 +- src/diagram/ConstraintCanvas.cpp | 165 +- src/diagram/ConstraintCanvas.h | 8 +- src/diagram/DeploymentDiagramView.cpp | 93 +- src/diagram/DeploymentDiagramView.h | 9 +- src/diagram/DeploymentDiagramWindow.cpp | 150 +- src/diagram/DeploymentNodeCanvas.cpp | 263 +- src/diagram/DeploymentNodeCanvas.h | 3 +- src/diagram/DiagramCanvas.cpp | 221 +- src/diagram/DiagramCanvas.h | 11 +- src/diagram/DiagramItem.cpp | 42 +- src/diagram/DiagramItem.h | 23 +- src/diagram/DiagramView.cpp | 1139 ++- src/diagram/DiagramView.h | 46 +- src/diagram/DiagramWindow.cpp | 95 +- src/diagram/DiagramWindow.h | 16 +- src/diagram/ExpansionNodeCanvas.cpp | 85 +- src/diagram/ExpansionNodeCanvas.h | 3 +- src/diagram/ExpansionRegionCanvas.cpp | 250 +- src/diagram/ExpansionRegionCanvas.h | 10 +- src/diagram/FlowCanvas.cpp | 118 +- src/diagram/FragmentCanvas.cpp | 105 +- src/diagram/FragmentCanvas.h | 5 +- src/diagram/FragmentSeparatorCanvas.cpp | 45 +- src/diagram/FragmentSeparatorCanvas.h | 3 +- src/diagram/HubCanvas.cpp | 30 +- src/diagram/HubCanvas.h | 2 +- src/diagram/IconCanvas.cpp | 153 +- src/diagram/IconCanvas.h | 4 +- src/diagram/ImageCanvas.cpp | 157 +- src/diagram/ImageCanvas.h | 3 +- src/diagram/InfoCanvas.cpp | 50 +- src/diagram/InfoCanvas.h | 2 +- .../InterruptibleActivityRegionCanvas.cpp | 74 +- .../InterruptibleActivityRegionCanvas.h | 7 +- src/diagram/LabelCanvas.cpp | 106 +- src/diagram/LabelCanvas.h | 13 +- src/diagram/NoteCanvas.cpp | 220 +- src/diagram/NoteCanvas.h | 4 +- src/diagram/ObjectDiagramView.cpp | 46 +- src/diagram/ObjectDiagramView.h | 3 +- src/diagram/ObjectDiagramWindow.cpp | 103 +- src/diagram/ObjectLinkCanvas.cpp | 297 +- src/diagram/OdClassInstCanvas.cpp | 255 +- src/diagram/OdClassInstCanvas.h | 4 +- src/diagram/PackageCanvas.cpp | 97 +- src/diagram/PackageCanvas.h | 3 +- src/diagram/ParameterCanvas.cpp | 94 +- src/diagram/ParameterCanvas.h | 3 +- src/diagram/ParameterSetCanvas.cpp | 184 +- src/diagram/ParameterSetCanvas.h | 7 +- src/diagram/PinCanvas.cpp | 87 +- src/diagram/PinCanvas.h | 3 +- src/diagram/PseudoStateCanvas.cpp | 81 +- src/diagram/PseudoStateCanvas.h | 3 +- src/diagram/RelationCanvas.cpp | 240 +- src/diagram/RelationCanvas.h | 2 +- src/diagram/SdClassInstCanvas.cpp | 286 +- src/diagram/SdClassInstCanvas.h | 5 +- src/diagram/SdContinuationCanvas.cpp | 74 +- src/diagram/SdContinuationCanvas.h | 5 +- src/diagram/SdDurationCanvas.cpp | 258 +- src/diagram/SdDurationCanvas.h | 3 +- src/diagram/SdLifeLineCanvas.cpp | 146 +- src/diagram/SdLifeLineCanvas.h | 7 +- src/diagram/SdLostFoundMsgSupportCanvas.cpp | 21 +- src/diagram/SdLostFoundMsgSupportCanvas.h | 4 +- src/diagram/SdMsgBaseCanvas.cpp | 44 +- src/diagram/SdMsgBaseCanvas.h | 2 +- src/diagram/SdMsgCanvas.cpp | 243 +- src/diagram/SdMsgCanvas.h | 1 + src/diagram/SdObjCanvas.cpp | 8 +- src/diagram/SdSelfMsgCanvas.cpp | 216 +- src/diagram/SdSelfMsgCanvas.h | 2 + src/diagram/SelectAreaCanvas.cpp | 18 +- src/diagram/SelectAreaCanvas.h | 10 +- src/diagram/SeqDiagramView.cpp | 170 +- src/diagram/SeqDiagramView.h | 5 +- src/diagram/SeqDiagramWindow.cpp | 202 +- src/diagram/SimpleRelationCanvas.cpp | 91 +- src/diagram/SimpleRelationCanvas.h | 2 +- src/diagram/StateActionCanvas.cpp | 209 +- src/diagram/StateActionCanvas.h | 3 +- src/diagram/StateCanvas.cpp | 175 +- src/diagram/StateCanvas.h | 9 +- src/diagram/StateDiagramView.cpp | 79 +- src/diagram/StateDiagramView.h | 3 +- src/diagram/StateDiagramWindow.cpp | 260 +- src/diagram/StereotypePropertiesCanvas.cpp | 153 +- src/diagram/StereotypePropertiesCanvas.h | 2 +- src/diagram/SubjectCanvas.cpp | 83 +- src/diagram/SubjectCanvas.h | 6 +- src/diagram/TemplateCanvas.cpp | 30 +- src/diagram/TemplateCanvas.h | 3 +- src/diagram/TextCanvas.cpp | 221 +- src/diagram/TextCanvas.h | 5 +- src/diagram/TransitionCanvas.cpp | 98 +- src/diagram/UcClassCanvas.cpp | 292 +- src/diagram/UcClassCanvas.h | 3 +- src/diagram/UcUseCaseCanvas.cpp | 94 +- src/diagram/UcUseCaseCanvas.h | 5 +- src/diagram/UmlCanvas.cpp | 141 +- src/diagram/UmlCanvas.h | 28 +- src/diagram/UmlDesktop.h | 2 +- src/diagram/UmlWindow.cpp | 1108 +- src/diagram/UmlWindow.h | 133 +- src/diagram/UseCaseDiagramView.cpp | 244 +- src/diagram/UseCaseDiagramView.h | 9 +- src/diagram/UseCaseDiagramWindow.cpp | 169 +- src/dialog/About.cpp | 44 +- src/dialog/ActivityActionDialog.cpp | 770 +- src/dialog/ActivityActionDialog.h | 77 +- src/dialog/ActivityDialog.cpp | 200 +- src/dialog/ActivityDialog.h | 14 +- src/dialog/ActivityObjectDialog.cpp | 247 +- src/dialog/ActivityObjectDialog.h | 18 +- src/dialog/ActivityPartitionDialog.cpp | 152 +- src/dialog/ActivityPartitionDialog.h | 17 +- src/dialog/AnnotationDialog.cpp | 36 +- src/dialog/AnnotationDialog.h | 4 +- src/dialog/ArtifactDialog.cpp | 717 +- src/dialog/ArtifactDialog.h | 35 +- src/dialog/AttributeDialog.cpp | 531 +- src/dialog/AttributeDialog.h | 19 +- src/dialog/BasicDialog.cpp | 74 +- src/dialog/BasicDialog.h | 18 +- src/dialog/BodyDialog.cpp | 32 +- src/dialog/BodyDialog.h | 15 +- src/dialog/BrowserSearchDialog.cpp | 117 +- src/dialog/BrowserSearchDialog.h | 6 +- src/dialog/ClassDialog.cpp | 1141 ++- src/dialog/ClassDialog.h | 78 +- src/dialog/ClassInstanceDialog.cpp | 236 +- src/dialog/ClassInstanceDialog.h | 15 +- src/dialog/ClassListDialog.cpp | 33 +- src/dialog/ClassListDialog.h | 10 +- src/dialog/ClassSettingsDialog.cpp | 45 +- src/dialog/ClassViewDialog.cpp | 87 +- src/dialog/ClassViewDialog.h | 12 +- src/dialog/CodAddMsgDialog.cpp | 102 +- src/dialog/CodAddMsgDialog.h | 10 +- src/dialog/CodChangeMsgDialog.cpp | 73 +- src/dialog/CodChangeMsgDialog.h | 9 +- src/dialog/CodEditMsgDialog.cpp | 8 +- src/dialog/CodEditMsgDialog.h | 3 - src/dialog/ColMsgTable.cpp | 74 +- src/dialog/ColMsgTable.h | 8 +- src/dialog/ComboItem.cpp | 41 +- src/dialog/ComboItem.h | 16 +- src/dialog/ComponentDialog.cpp | 244 +- src/dialog/ComponentDialog.h | 61 +- src/dialog/ConstraintDialog.cpp | 90 +- src/dialog/ConstraintDialog.h | 4 +- src/dialog/ContinuationDialog.cpp | 20 +- src/dialog/DecoratorDialog.cpp | 35 +- src/dialog/DecoratorDialog.h | 4 +- src/dialog/DialogTimer.cpp | 23 +- src/dialog/DialogTimer.h | 4 +- src/dialog/DialogUtil.cpp | 174 +- src/dialog/DialogUtil.h | 35 +- src/dialog/EdgeMenuDialog.cpp | 10 +- src/dialog/EdgeMenuDialog.h | 17 +- src/dialog/EnvDialog.cpp | 799 +- src/dialog/EnvDialog.h | 6 +- src/dialog/ExpansionRegionDialog.cpp | 85 +- src/dialog/ExpansionRegionDialog.h | 16 +- src/dialog/ExtraMemberDialog.cpp | 157 +- src/dialog/ExtraMemberDialog.h | 11 +- src/dialog/FlowDialog.cpp | 105 +- src/dialog/FlowDialog.h | 11 +- src/dialog/FragmentDialog.cpp | 82 +- src/dialog/FragmentDialog.h | 6 +- src/dialog/GenerationSettingsBuiltinTable.cpp | 2 +- src/dialog/GenerationSettingsDialog.cpp | 1691 +-- src/dialog/GenerationSettingsDialog.h | 32 +- src/dialog/GreetingsDialog.cpp | 30 +- src/dialog/HelpDialog.cpp | 51 +- src/dialog/HelpDialog.h | 4 +- src/dialog/HelpRegexpDialog.h | 2 - src/dialog/HideShowDialog.cpp | 105 +- src/dialog/HideShowDialog.h | 12 +- src/dialog/ImageDialog.cpp | 37 +- src/dialog/InstanceDialog.cpp | 77 +- src/dialog/InstanceDialog.h | 4 +- src/dialog/KeyValueTable.cpp | 89 +- src/dialog/KeyValueTable.h | 5 +- src/dialog/ListBoxBrowserNode.h | 6 +- src/dialog/MLEDialog.cpp | 21 +- src/dialog/MLinesItem.cpp | 26 +- src/dialog/MLinesItem.h | 7 +- src/dialog/MyInputDialog.cpp | 50 +- src/dialog/MyInputDialog.h | 4 +- src/dialog/MyTable.cpp | 102 +- src/dialog/MyTable.h | 88 +- src/dialog/ObjectLinkDialog.cpp | 95 +- src/dialog/ObjectLinkDialog.h | 3 - src/dialog/OperationDialog.cpp | 2211 ++-- src/dialog/OperationDialog.h | 80 +- src/dialog/OperationListDialog.cpp | 29 +- src/dialog/OperationListDialog.h | 8 +- src/dialog/PackageDialog.cpp | 424 +- src/dialog/PackageDialog.h | 16 +- src/dialog/ParameterDialog.cpp | 327 +- src/dialog/ParameterDialog.h | 21 +- src/dialog/ParameterSetDialog.cpp | 150 +- src/dialog/ParameterSetDialog.h | 20 +- src/dialog/PinDialog.cpp | 229 +- src/dialog/PinDialog.h | 20 +- src/dialog/PseudoStateDialog.cpp | 106 +- src/dialog/PseudoStateDialog.h | 14 +- src/dialog/ReferenceDialog.cpp | 39 +- src/dialog/ReferenceDialog.h | 4 +- src/dialog/RelatedElementsDialog.cpp | 54 +- src/dialog/RelationDialog.cpp | 587 +- src/dialog/RelationDialog.h | 49 +- src/dialog/RevSettingsDialog.cpp | 176 +- src/dialog/RevSettingsDialog.h | 10 +- src/dialog/SaveProgress.cpp | 2 +- src/dialog/SaveProgress.h | 6 +- src/dialog/SdMsgDialog.cpp | 105 +- src/dialog/SdMsgDialog.h | 10 +- src/dialog/SettingsDialog.cpp | 316 +- src/dialog/SettingsDialog.h | 14 +- src/dialog/ShortcutDialog.cpp | 295 +- src/dialog/ShortcutDialog.h | 10 +- src/dialog/SimpleRelationDialog.cpp | 63 +- src/dialog/SimpleRelationDialog.h | 13 +- src/dialog/SourceDialog.cpp | 22 +- src/dialog/StateActionDialog.cpp | 71 +- src/dialog/StateActionDialog.h | 11 +- src/dialog/StateDialog.cpp | 324 +- src/dialog/StateDialog.h | 15 +- src/dialog/StereotypeDialog.cpp | 35 +- src/dialog/StereotypeDialog.h | 4 +- src/dialog/StereotypesDialog.cpp | 349 +- src/dialog/StereotypesDialog.h | 4 +- src/dialog/StringTable.cpp | 215 +- src/dialog/StringTable.h | 2 +- src/dialog/ToolDialog.cpp | 59 +- src/dialog/ToolDialog.h | 6 +- src/dialog/TraceDialog.cpp | 30 +- src/dialog/TraceDialog.h | 4 +- src/dialog/TransitionDialog.cpp | 102 +- src/dialog/TransitionDialog.h | 11 +- src/dialog/UseCaseDialog.cpp | 65 +- src/dialog/UseCaseDialog.h | 13 +- src/dialog/VisibilityGroup.cpp | 18 +- src/dialog/VisibilityGroup.h | 8 +- src/dialog/edgemenudialogbase.cpp | 5 +- src/dialog/edgemenudialogbase.h | 2 + src/dialog/edgemenudialogqt4.h | 2 +- src/dialog/tabdialog.cpp | 104 + src/dialog/tabdialog.h | 41 + src/dialog/tablewidgetitemdelegate.cpp | 104 + src/dialog/tablewidgetitemdelegate.h | 27 + src/douml.pro | 94 +- src/icons.qrc.bak | 15 + src/main.cpp | 51 +- src/misc/ClipboardManager.cpp | 2 +- src/misc/GenerateTypeId.cpp | 14 +- src/misc/GenerationSettings.cpp | 150 +- src/misc/Images.cpp | 43 +- src/misc/Labeled.cpp | 25 +- src/misc/Labeled.h | 37 +- src/misc/ProfiledStereotypes.cpp | 282 +- src/misc/ProfiledStereotypes.h | 4 +- src/misc/Settings.cpp | 460 +- src/misc/Shortcut.cpp | 75 +- src/misc/Shortcut.h | 2 +- src/misc/UmlDrag.cpp | 19 +- src/misc/UmlDrag.h | 5 +- src/misc/UmlEnum.h | 7 +- src/misc/UmlGlobal.cpp | 18 +- src/misc/codec.cpp | 8 +- src/misc/codec.h | 1 + src/misc/mu.cpp | 26 +- src/misc/myio.cpp | 418 +- src/misc/myio.h | 29 +- src/misc/mystr.cpp | 8 +- src/misc/mystr.h | 34 +- src/misc/strutil.cpp | 48 +- src/misc/translate.cpp | 66 +- src/misc/translate.h | 4 +- src/tagmanagement/cpptagmanagement.cpp | 9 +- src/tagmanagement/cpptagmanagement.h | 2 +- src/tool/Socket.h | 21 +- src/tool/Tool.cpp | 73 +- src/tool/Tool.h | 9 +- src/tool/ToolCom.cpp | 154 +- src/tool/ToolCom.h | 18 +- src/tool/snippets.h | 4 +- src/ui/bbuttongroup.cpp | 65 + src/ui/bbuttongroup.h | 26 + src/ui/catalogwidget.cpp | 38 +- src/ui/catalogwidget.h | 4 +- src/ui/catalogwidget.ui | 46 +- src/ui/constructorinitializerdialog.cpp | 12 +- src/ui/constructorinitializerdialog.h | 2 +- src/ui/gridbox.cpp | 37 + src/ui/gridbox.h | 26 + src/ui/hhbox.cpp | 30 + src/ui/hhbox.h | 22 + src/ui/menufactory.cpp | 52 +- src/ui/menufactory.h | 18 +- src/ui/operationwidgetcpp.cpp | 2 +- src/ui/operationwidgetcpp.h | 2 +- src/ui/toolbarfactory.cpp | 38 + src/ui/toolbarfactory.h | 13 + src/ui/vvbox.cpp | 26 + src/ui/vvbox.h | 22 + src/ui/widgetwithlayout.cpp | 30 + src/ui/widgetwithlayout.h | 14 + 3077 files changed, 60184 insertions(+), 50937 deletions(-) create mode 100644 .gitignore.bak create mode 100644 genplugouts/CppUtilities/gridbox.cpp create mode 100644 genplugouts/CppUtilities/gridbox.h create mode 100644 genplugouts/CppUtilities/hhbox.cpp create mode 100644 genplugouts/CppUtilities/hhbox.h create mode 100644 genplugouts/CppUtilities/vvbox.cpp create mode 100644 genplugouts/CppUtilities/vvbox.h create mode 100644 genplugouts/FileControl/gridbox.cpp create mode 100644 genplugouts/FileControl/gridbox.h create mode 100644 genplugouts/FileControl/hhbox.cpp create mode 100644 genplugouts/FileControl/hhbox.h create mode 100644 genplugouts/FileControl/vvbox.cpp create mode 100644 genplugouts/FileControl/vvbox.h create mode 100644 genplugouts/GlobalChange/bbuttongroup.cpp create mode 100644 genplugouts/GlobalChange/bbuttongroup.h create mode 100644 genplugouts/GlobalChange/gridbox.cpp create mode 100644 genplugouts/GlobalChange/gridbox.h create mode 100644 genplugouts/GlobalChange/hhbox.cpp create mode 100644 genplugouts/GlobalChange/hhbox.h create mode 100644 genplugouts/GlobalChange/vgridbox.cpp create mode 100644 genplugouts/GlobalChange/vgridbox.h create mode 100644 genplugouts/GlobalChange/vvbox.cpp create mode 100644 genplugouts/GlobalChange/vvbox.h create mode 100644 genplugouts/Xmi2Generator/bbuttongroup.cpp create mode 100644 genplugouts/Xmi2Generator/bbuttongroup.h create mode 100644 genplugouts/Xmi2Generator/gridbox.cpp create mode 100644 genplugouts/Xmi2Generator/gridbox.h create mode 100644 genplugouts/Xmi2Generator/hhbox.cpp create mode 100644 genplugouts/Xmi2Generator/hhbox.h create mode 100644 genplugouts/gpro/gridbox.cpp create mode 100644 genplugouts/gpro/gridbox.h create mode 100644 genplugouts/gpro/hhbox.cpp create mode 100644 genplugouts/gpro/hhbox.h create mode 100644 genplugouts/import_rose/import_rose.pro create mode 100644 genplugouts/sm/gridbox.cpp create mode 100644 genplugouts/sm/gridbox.h create mode 100644 genplugouts/sm/hhbox.cpp create mode 100644 genplugouts/sm/hhbox.h create mode 100644 genplugouts/sm/sm.pro create mode 100644 genplugouts/tabdialogwrapper.cpp create mode 100644 genplugouts/tabdialogwrapper.h create mode 100644 genplugouts/uml_projection/hhbox.cpp create mode 100644 genplugouts/uml_projection/hhbox.h create mode 100644 genplugouts/usecasewizard/gridbox.cpp create mode 100644 genplugouts/usecasewizard/gridbox.h create mode 100644 genplugouts/usecasewizard/tabdialogwrapper.cpp create mode 100644 genplugouts/usecasewizard/tabdialogwrapper.h create mode 100644 genplugouts/usecasewizard/vvbox.cpp create mode 100644 genplugouts/usecasewizard/vvbox.h create mode 100644 genplugouts/xmi/bbuttongroup.cpp create mode 100644 genplugouts/xmi/bbuttongroup.h create mode 100644 genplugouts/xmi/hhbox.cpp create mode 100644 genplugouts/xmi/hhbox.h create mode 100644 plugouts/cpp_utilities/135682 create mode 100644 plugouts/cpp_utilities/135810 create mode 100644 plugouts/cpp_utilities/158210.bodies create mode 100644 plugouts/cpp_utilities/158850.bodies create mode 100644 plugouts/cpp_utilities/158978.bodies create mode 100644 plugouts/cpp_utilities/159234.bodies create mode 100644 plugouts/cpp_utilities/159490.bodies create mode 100644 plugouts/cpp_utilities/159746.bodies create mode 100644 plugouts/cpp_utilities/159874.bodies create mode 100644 plugouts/cpp_utilities/160002.bodies create mode 100644 plugouts/cpp_utilities/160258.bodies create mode 100644 plugouts/cpp_utilities/2.session create mode 100644 src/JavaCat/menufactory.cpp create mode 100644 src/JavaCat/menufactory.h create mode 100644 src/dialog/tabdialog.cpp create mode 100644 src/dialog/tabdialog.h create mode 100644 src/dialog/tablewidgetitemdelegate.cpp create mode 100644 src/dialog/tablewidgetitemdelegate.h create mode 100644 src/icons.qrc.bak create mode 100644 src/ui/bbuttongroup.cpp create mode 100644 src/ui/bbuttongroup.h create mode 100644 src/ui/gridbox.cpp create mode 100644 src/ui/gridbox.h create mode 100644 src/ui/hhbox.cpp create mode 100644 src/ui/hhbox.h create mode 100644 src/ui/toolbarfactory.cpp create mode 100644 src/ui/toolbarfactory.h create mode 100644 src/ui/vvbox.cpp create mode 100644 src/ui/vvbox.h create mode 100644 src/ui/widgetwithlayout.cpp create mode 100644 src/ui/widgetwithlayout.h diff --git a/.gitignore b/.gitignore index 31d0a5ff4..000aa8d09 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ release object_script.* minimal.supp minimalraw.log + *moc_*.cpp* *.~* *.pro.* diff --git a/.gitignore.bak b/.gitignore.bak new file mode 100644 index 000000000..c8f2cce2a --- /dev/null +++ b/.gitignore.bak @@ -0,0 +1,108 @@ +.kdev4 +*.kdev +*~ +*.pro.user +*.o +*moc_* +*.rar +debug/* +release/* +debug +release +object_script.* +minimal.supp +minimalraw.log + +*moc_*.cpp* +*.~* +*.pro.* +*.pro.user.* +*.pro.user.*.* +*.pro.user +*qrc_*.cpp +makefile.* +Makefile.* +Makefile* +makefile* +include/Libs* +.cproject +.project +.settings +*.log +*.cppcheck +*.rc +*.tar.gz +*.svn* +*.vcproj* +*.ipb +*.obj +*.rar +*.pdb +*.suo +*.sln +*.idb +*.ncb +*.exe +*.vsp +*.idb +*.zip +*.o +*.exp +*.htm +*.manifest +*.dll +*vcxproj +*.ipch +*.sdf +*.opensdf +*.ncb +*.xcf +*.gch +*.pack +*.a +./metadata +!*.cpp +!*.h +!*.pro +!*.txt +!*.png +!*.jpg +!src/ +*.svn* +*.vcproj* +*.ipb +*.obj +*.rar +*.pdb +*.suo +*.sln +*.idb +*.ncb +*.exe +*.vsp +*.idb +*.zip +*.o +*.exp +*.htm +*.manifest +*.dll +*vcxproj +*.ipch +*.sdf +*.opensdf +*.ncb +*.xcf +*.gch +*.pack +*.a +*.cppcheck +*.autosave +*.blameresult +src/boost/ +ui_*.h +src/ui/ui_*.h +*.b +bin/douml +qrc_*.cpp +src/CppReverse/cpp_reverse diff --git a/bin/settings.ini b/bin/settings.ini index 09f0fdd44..3a3bf3ecf 100644 --- a/bin/settings.ini +++ b/bin/settings.ini @@ -7,17 +7,4 @@ fileformat=77 encoding=UTF-8 [Failing_Tools] -Tools="Import Rose,Uml projection,C++ state machine,Generate XMI 1.2,Generate .pro" - -[headers] -quickedit=@ByteArray(\0\0\0ÿ\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6Ý\0\0\0\x17\x1\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64ÿÿÿÿ\0\0\0\0\0\0\0\0\0\0\x17\0\0\x1\x11\0\0\0\x1\0\0\0\0\0\0\0\"\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0>\0\0\0\x1\0\0\0\0\0\0\0\x37\0\0\0\x1\0\0\0\0\0\0\0+\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x42\0\0\0\x1\0\0\0\0\0\0\0\x1d\0\0\0\x1\0\0\0\0\0\0\0\x32\0\0\0\x1\0\0\0\0\0\0\0\x35\0\0\0\x1\0\0\0\0\0\0\0#\0\0\0\x1\0\0\0\0\0\0\0$\0\0\0\x1\0\0\0\0\0\0\0(\0\0\0\x1\0\0\0\0\0\0\0.\0\0\0\x1\0\0\0\0\0\0\0!\0\0\0\x1\0\0\0\0\0\0\0\x41\0\0\0\x1\0\0\0\0\0\0\0-\0\0\0\x1\0\0\0\0\0\0\0\x38\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x1i\0\0\0\x1\0\0\0\0) - -[quickedit_checkboxes] -cpp=true -java=false -php=false -python=false -idl=false - -[window] -size=@Size(927 595) +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/genplugouts/BrowserSort/BrowserSort.pro b/genplugouts/BrowserSort/BrowserSort.pro index ce4441a89..04bcfe57c 100644 --- a/genplugouts/BrowserSort/BrowserSort.pro +++ b/genplugouts/BrowserSort/BrowserSort.pro @@ -328,8 +328,8 @@ SOURCES = ./UmlActivityPin.cpp \ ./UmlBaseClassView.cpp \ ./UmlBaseDeepHistoryPseudoState.cpp \ ./UmlBaseShallowHistoryPseudoState.cpp -#The following line was inserted by qt3to4 -QT += network qt3support +DEFINES += TRUE=true FALSE=false +QT += network QMAKE_CXXFLAGS += -std=gnu++11 mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ 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 +#include 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 CppSettings::_map_includes; +QHash 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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _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 + 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 +#include 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 IdlSettings::_map_includes; +QHash 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 + #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _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 +#include 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 JavaSettings::_map_imports; +QHash 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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + // 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 + 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 + 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 + 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 + 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 + 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..5bb8f1aab 100644 --- a/genplugouts/BrowserSort/UmlArtifact.h +++ b/genplugouts/BrowserSort/UmlArtifact.h @@ -3,7 +3,7 @@ #include "UmlBaseArtifact.h" -#include + // 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) {}; virtual int orderWeight(); 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 + // 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..0e2856d02 100644 --- a/genplugouts/BrowserSort/UmlBaseAccessVariableValueAction.h +++ b/genplugouts/BrowserSort/UmlBaseAccessVariableValueAction.h @@ -3,7 +3,7 @@ #include "UmlActivityAction.h" -#include + 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/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 +#include 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..0d009bd8f 100644 --- a/genplugouts/BrowserSort/UmlBaseActivity.h +++ b/genplugouts/BrowserSort/UmlBaseActivity.h @@ -4,7 +4,7 @@ #include "UmlItem.h" #include "anItemKind.h" -#include + 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/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 +#include -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..a0c197cab 100644 --- a/genplugouts/BrowserSort/UmlBaseActivityAction.h +++ b/genplugouts/BrowserSort/UmlBaseActivityAction.h @@ -3,7 +3,7 @@ #include "UmlActivityNode.h" -#include + 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/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 +#include 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..1a826cd23 100644 --- a/genplugouts/BrowserSort/UmlBaseActivityActionClasses.h +++ b/genplugouts/BrowserSort/UmlBaseActivityActionClasses.h @@ -4,7 +4,7 @@ #include "UmlActivityAction.h" #include "anItemKind.h" -#include + #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/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 + 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 + 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 + 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 + 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 +#include 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 + #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 +#include 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 + 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 + 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 + 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 +#include 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 & UmlBaseArtifact::associatedClasses() +const QVector & 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 & l) +bool UmlBaseArtifact::set_AssociatedClasses(const QVector & l) { - UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector &) l); + UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector &) l); if (UmlCom::read_bool()) { if (_defined) @@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector & l) return FALSE; } -const Q3PtrVector & UmlBaseArtifact::associatedArtifacts() +const QVector & 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 -#include + + #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 <> - const Q3PtrVector & associatedClasses(); + const QVector & 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 <> // // On error return FALSE in C++, produce a RuntimeException in Java - bool set_AssociatedClasses(const Q3PtrVector & l); + bool set_AssociatedClasses(const QVector & l); // returns (in Java a copy of) the associated artifacts list // significant when the artifact is not stereotyped <> - const Q3PtrVector & associatedArtifacts(); + const QVector & 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 _assoc_classes; + QVector _assoc_classes; - Q3PtrVector _associated; + QVector _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 +#include 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 + #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 + 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..357e61063 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 -#include +#include +#include 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 UmlBaseClass::formals() +QList UmlBaseClass::formals() { UmlCom::send_cmd(_identifier, formalsCmd); - Q3ValueList formals; + QList 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 UmlBaseClass::actuals() +QList UmlBaseClass::actuals() { UmlCom::send_cmd(_identifier, actualsCmd); - Q3ValueList actuals; + QList 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 UmlBaseClass::associatedComponents() +const QVector UmlBaseClass::associatedComponents() { UmlCom::send_cmd(_identifier, assocComponentCmd); - Q3PtrVector result; + QVector 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,13 +325,13 @@ 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 ch = children(); - Q3CString destr = "~" + name(); + const QVector ch = children(); + QByteArray destr = "~" + name(); for (unsigned i = 0; i != ch.size(); i += 1) { if (ch[i]->kind() == anOperation) { @@ -345,9 +345,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s) return TRUE; } -Q3Dict UmlBaseClass::_classes(1001); +QHash 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..4da5f6558 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 -#include - -#include -#include - +#include +#include #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 formals(); + QList 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 actuals(); + QList 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 associatedComponents(); + const QVector 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 _classes; + static QHash _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 + 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 +#include #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 + // 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 +#include 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 + #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 + 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 + 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 & UmlBaseComponent::realizedClasses() +const QVector & UmlBaseComponent::realizedClasses() { read_if_needed_(); return _realized; } -const Q3PtrVector & UmlBaseComponent::providedClasses() +const QVector & UmlBaseComponent::providedClasses() { read_if_needed_(); return _provided; } -const Q3PtrVector & UmlBaseComponent::requiredClasses() +const QVector & UmlBaseComponent::requiredClasses() { read_if_needed_(); return _required; } -bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector & realized, const Q3PtrVector & provided, const Q3PtrVector & required) +bool UmlBaseComponent::set_AssociatedClasses(const QVector & realized, const QVector & provided, const QVector & 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 -#include + + #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 & realizedClasses(); + const QVector & realizedClasses(); // returns (in Java a copy of) the optional provided classes - const Q3PtrVector & providedClasses(); + const QVector & providedClasses(); // returns (in Java a copy of) the optional required classes - const Q3PtrVector & requiredClasses(); + const QVector & 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 & realized, const Q3PtrVector & provided, const Q3PtrVector & required); + bool set_AssociatedClasses(const QVector & realized, const QVector & provided, const QVector & 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 _realized; + QVector _realized; - Q3PtrVector _provided; + QVector _provided; - Q3PtrVector _required; + QVector _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 + 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 + 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 + 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 + // 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 + 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 + 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 -bool UmlBaseDiagram::saveIn(const Q3CString & s) const +#include +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 + // 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 + 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 + 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 + 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 + #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 +#include 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 + 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 + 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 +#include 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 + #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 + 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 + #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 + 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 + 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..4b63c0abf 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 +#include -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 UmlBaseItem::children() +const QVector 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 UmlBaseItem::properties() +const QHash UmlBaseItem::properties() { read_if_needed_(); @@ -163,8 +163,7 @@ const Q3Dict 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 UmlBaseItem::referencedBy() +const QVector UmlBaseItem::referencedBy() { UmlCom::send_cmd(_identifier, referencedByCmd); - Q3PtrVector result; + QVector result; UmlCom::read_item_list(result); return result; @@ -241,17 +240,17 @@ bool UmlBaseItem::isToolRunning(int id) return UmlCom::read_bool(); } -const Q3PtrVector UmlBaseItem::markedItems() +const QVector UmlBaseItem::markedItems() { UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd); - Q3PtrVector result; + QVector result; UmlCom::read_item_list(result); return result; } -Q3PtrDict UmlBaseItem::_all(997); +QHash 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; + _children = new QVector; 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); @@ -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 -#include - -#include -#include -//#include "OnInstanceCmd.h" #include "Tools/ApiCmd.h" #include "aVisibility.h" #include "aDirection.h" - +#include +#include 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 children(); + const QVector 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 properties(); + const QHash 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 referencedBy(); + const QVector 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 markedItems(); + static const QVector 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 * _children; + QVector * _children; - Q3Dict _dict; + QHash _dict; - static Q3PtrDict _all; + static QHash _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 + 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 + 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 + 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 + 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 + 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 +#include -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 + 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 -#include +#include +#include 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 UmlBaseOperation::params() +const QList 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 UmlBaseOperation::exceptions() +const QList 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..6fcbee8ba 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 -#include +#include + #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 params(); + const QList 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 exceptions(); + const QList 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 @@ -133,7 +133,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 @@ -182,7 +182,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 _params; + QList _params; - Q3ValueList _exceptions; + QList _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 +#include 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..275539255 100644 --- a/genplugouts/BrowserSort/UmlBasePackage.h +++ b/genplugouts/BrowserSort/UmlBasePackage.h @@ -4,7 +4,7 @@ #include "UmlItem.h" #include "anItemKind.h" -#include + 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 @@ -132,7 +132,7 @@ class UmlBasePackage : public UmlItem //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 & UmlBaseParameterSet::pins() +const QVector & UmlBaseParameterSet::pins() { read_if_needed_(); return _pins; } -bool UmlBaseParameterSet::set_Pins(const Q3PtrVector & v) +bool UmlBaseParameterSet::set_Pins(const QVector & v) { - UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector &) v); + UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector &) 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 &) _pins); + UmlCom::read_item_list((QVector &) _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 #include "UmlItem.h" #include "anItemKind.h" -#include -#include + + 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 & pins(); + const QVector & pins(); // set the pins - bool set_Pins(const Q3PtrVector & v); + bool set_Pins(const QVector & 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 _pins; + QVector _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 + #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 + 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 +#include 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 + #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 + 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 + 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 +#include 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 + #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 +#include 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 + 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 + 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 + 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 +#include 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 + #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 + 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 + 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 + 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 +#include // 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 + // 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 + // 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 + // 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 + #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 + // 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 + // 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..489daa93b 100644 --- a/genplugouts/BrowserSort/UmlCom.cpp +++ b/genplugouts/BrowserSort/UmlCom.cpp @@ -1,21 +1,20 @@ #include "UmlCom.h" - -#include -//Added by qt3to4: -#include - +#include +#include #include "UmlCom.h" #include "UmlItem.h" #include "UmlTypeSpec.h" #include "UmlClass.h" #include "UmlSettings.h" #include "Tools/ApiCmd.h" +#include 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,7 +65,7 @@ void UmlCom::close() sock = 0; } -Q3SocketDevice * UmlCom::sock; +QTcpSocket * UmlCom::sock; char * UmlCom::buffer_in; @@ -132,7 +132,7 @@ void UmlCom::read_buffer(unsigned int len) 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 @@ -152,7 +152,7 @@ void UmlCom::read_buffer(unsigned int len) break; p += nread; - sock->waitForMore(100); + sock->waitForReadyRead(100); } #ifdef TRACE @@ -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 & l) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l) { #ifdef TRACE - cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l)\n"; + cout << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l)\n"; #endif write_char(onInstanceCmd); @@ -541,10 +541,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & l3) { #ifdef TRACE - cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3)\n"; + cout << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l1, const QVector & l2, const QVector & l3)\n"; #endif write_char(onInstanceCmd); @@ -643,7 +643,7 @@ unsigned int UmlCom::read_unsigned() ((unsigned char *) p_buffer_in)[-1]; } -void UmlCom::read_item_list(Q3PtrVector & v) +void UmlCom::read_item_list(QVector & v) { unsigned n = read_unsigned(); @@ -654,10 +654,11 @@ void UmlCom::read_item_list(Q3PtrVector & 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 & +void UmlCom::fatal_error(const QByteArray & #ifdef DEBUG_BOUML msg #endif @@ -684,7 +685,7 @@ void UmlCom::flush() p_buffer_out = buffer_out; for (;;) { - int sent = sock->writeBlock(p_buffer_out, len); + int 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..cbfc70463 100644 --- a/genplugouts/BrowserSort/UmlCom.h +++ b/genplugouts/BrowserSort/UmlCom.h @@ -1,25 +1,21 @@ #ifndef _UMLCOM_H #define _UMLCOM_H - -#include -////#include "CmdFamily.h" -////#include "OnInstanceCmd.h" #include "Tools/ApiCmd.h" #include "anItemKind.h" #include "aRelationKind.h" -#include -#include -#include + + + #include class UmlItem; class UmlTypeSpec; class UmlClass; -class Q3SocketDevice; +class QTcpSocket; class UmlItem; class UmlTypeSpec; class UmlClass; @@ -66,7 +62,7 @@ class UmlCom static void close(); private: - static Q3SocketDevice * sock; + static QTcpSocket * sock; static char * buffer_in; @@ -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 & l); - static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & 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 & v); + static void read_item_list(QVector & 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 + // 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 + // 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 + // 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 + // 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 + // 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 + // 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 + 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 + 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 + 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 + 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 + // 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 + 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 + 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..a82d1d1e4 100644 --- a/genplugouts/BrowserSort/UmlItem.cpp +++ b/genplugouts/BrowserSort/UmlItem.cpp @@ -3,7 +3,7 @@ #include "UmlCom.h" //Added by qt3to4: -#include + UmlItem::~UmlItem() { } @@ -20,7 +20,7 @@ int UmlItem::orderWeight() void UmlItem::sortChildren() { - const Q3PtrVector & qv = children(); + const QVector & 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 + qSort(v); +#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 -#include -//Added by qt3to4: -#include - +#include // 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 +class VectorOfUmlItem : public QVector { 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 + //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 + // 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 + // 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 + 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 + // 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 + // 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 + // 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 + 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 + 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 + #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 + 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 + // 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 + // 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..0ec146ea5 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 UmlSettings::artifactDescription() +#include +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,25 +104,25 @@ 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 UmlSettings::_map_builtins; +QHash UmlSettings::_map_builtins; UmlBuiltin * UmlSettings::_builtins; -Q3Dict UmlSettings::_map_relation_stereotypes; +QHash UmlSettings::_map_relation_stereotypes; UmlStereotype * UmlSettings::_relation_stereotypes; -Q3Dict UmlSettings::_map_class_stereotypes; +QHash UmlSettings::_map_class_stereotypes; UmlStereotype * UmlSettings::_class_stereotypes; @@ -136,7 +136,7 @@ void UmlSettings::read_() _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,7 +229,7 @@ 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; @@ -237,7 +237,7 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s) 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,7 +265,7 @@ 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; @@ -273,7 +273,7 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s) 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,7 +298,7 @@ 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; @@ -306,7 +306,7 @@ UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s) 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 -#include - +#include +#include 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 _map_builtins; + static QHash _map_builtins; static UmlBuiltin * _builtins; - static Q3Dict _map_relation_stereotypes; + static QHash _map_relation_stereotypes; static UmlStereotype * _relation_stereotypes; - static Q3Dict _map_class_stereotypes; + static QHash _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 + 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 + 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 -#include // 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 + 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 +#include -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 - +#include 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 + // 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 + // 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 + // 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 1f358687d..6c604c27f 100644 --- a/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp +++ b/genplugouts/CppUtilities/ConstrDestrCopyDialog.cpp @@ -6,16 +6,15 @@ #include "UmlClass.h" #include -#include -#include + +#include #include #include #include -#include -#include +#include +#include #include -//Added by qt3to4: -#include +#include #include "Logging/QsLog.h" #include @@ -41,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 labels; + setModal(true); + QVBoxLayout * vbox = new QVBoxLayout(this); + GridBox * g; + QList labels; QLabel * lbl; vbox->setSpacing(5); @@ -59,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; @@ -95,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; } @@ -137,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; } @@ -176,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()); @@ -208,10 +221,10 @@ ConstrDestrCopyDialog::ConstrDestrCopyDialog(UmlClass * cl, bool have_constructo void ConstrDestrCopyDialog::polish() { - QDialog::polish(); + QDialog::ensurePolished(); QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); - settings.setIniCodec(QTextCodec::codecForName("UTF-8")); + settings.setIniCodec("UTF-8"); int l, t, r, b; l = settings.value("Desktop/left", -1).toInt(); r = settings.value("Desktop/right", -1).toInt(); diff --git a/genplugouts/CppUtilities/CppSettings.cpp b/genplugouts/CppUtilities/CppSettings.cpp index f95daa113..7b3ee6fc5 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 +#include 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,7 +1120,7 @@ bool CppSettings::_is_force_namespace_gen; bool CppSettings::_is_generate_javadoc_comment; -Q3Dict CppSettings::_map_includes; +QHash CppSettings::_map_includes; void CppSettings::read_() { @@ -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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _map_includes; protected: diff --git a/genplugouts/CppUtilities/CppUtilities.pro b/genplugouts/CppUtilities/CppUtilities.pro index 83b23281c..657fea8b1 100644 --- a/genplugouts/CppUtilities/CppUtilities.pro +++ b/genplugouts/CppUtilities/CppUtilities.pro @@ -1,3 +1,4 @@ +#ok TEMPLATE = app TARGET = cpp_util CONFIG(Debug, Debug|Release) { @@ -10,7 +11,7 @@ CONFIG(Release, Debug|Release) { CONFIG += qt Release QMAKE_POST_LINK = " " } -DEFINES = WITHCPP TRACE +DEFINES += WITHCPP TRACE INCLUDEPATH += ../../src HEADERS = ./UmlBasePackage.h \ ./UmlFragmentCompartment.h \ @@ -213,7 +214,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 \ @@ -416,10 +420,13 @@ 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 +QT += network widgets +DEFINES += TRUE=true FALSE=false DEBUG DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/cpp_util @@ -434,3 +441,4 @@ UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ + 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 + 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 +#include 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 IdlSettings::_map_includes; +QHash 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 + #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _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 +#include 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 JavaSettings::_map_imports; +QHash 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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _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 +#include #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 + #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 +#include 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 PythonSettings::_map_imports; +QHash 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 + #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _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 - +#include 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + // 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 + 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 + 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 + 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 + 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 + 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 + 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 + // 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 + // 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 + 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 +#include 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 + 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 +#include -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 + 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 +#include 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 + #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 + 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 + 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 + 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 + 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 +#include 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 + #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 +#include 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 + 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 + 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 + 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 + 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 +#include 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 & UmlBaseArtifact::associatedClasses() +const QVector & 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 & l) +bool UmlBaseArtifact::set_AssociatedClasses(const QVector & l) { - UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector &) l); + UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector &) l); if (UmlCom::read_bool()) { // tests != to bypass Qt 2.3 bug @@ -103,7 +104,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector & l) return FALSE; } -const Q3PtrVector & UmlBaseArtifact::associatedArtifacts() +const QVector & 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 -#include +#include + #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 <> - const Q3PtrVector & associatedClasses(); + const QVector & 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 <> // // On error return FALSE in C++, produce a RuntimeException in Java - bool set_AssociatedClasses(const Q3PtrVector & l); + bool set_AssociatedClasses(const QVector & l); // returns (in Java a copy of) the associated artifacts list // significant when the artifact is not stereotyped <> - const Q3PtrVector & associatedArtifacts(); + const QVector & 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 _assoc_classes; + QVector _assoc_classes; - Q3PtrVector _associated; + QVector _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 +#include 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 + #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 + 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..e11847b02 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 -#include +#include +#include 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 UmlBaseClass::formals() +QList UmlBaseClass::formals() { UmlCom::send_cmd(_identifier, formalsCmd); - Q3ValueList formals; + QList 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 UmlBaseClass::actuals() +QList UmlBaseClass::actuals() { UmlCom::send_cmd(_identifier, actualsCmd); - Q3ValueList actuals; + QList 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 UmlBaseClass::associatedComponents() +const QVector UmlBaseClass::associatedComponents() { UmlCom::send_cmd(_identifier, assocComponentCmd); - Q3PtrVector result; + QVector 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,13 +403,13 @@ 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 ch = children(); - Q3CString destr = "~" + name(); + const QVector ch = children(); + QByteArray destr = "~" + name(); for (unsigned i = 0; i != ch.size(); i += 1) { if (ch[i]->kind() == anOperation) { @@ -423,9 +423,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s) return TRUE; } -Q3Dict UmlBaseClass::_classes(1001); +QHash 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..5356644e3 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 -#include -#include -#include +#include + + + #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 formals(); + QList 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 actuals(); + QList 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 associatedComponents(); + const QVector 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 _classes; + static QHash _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 + 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 +#include +#include anItemKind UmlBaseClassInstance::kind() { @@ -47,7 +47,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v) return FALSE; } -void UmlBaseClassInstance::attributesValue(Q3ValueList & result) +void UmlBaseClassInstance::attributesValue(QList & result) { UmlCom::send_cmd(_identifier, attributesCmd, (char) 0); @@ -62,7 +62,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList & result) } } -void UmlBaseClassInstance::relationsValue(Q3ValueList & result) +void UmlBaseClassInstance::relationsValue(QList & result) { UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0); @@ -77,16 +77,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList & result) } } -void UmlBaseClassInstance::availableAttributes(Q3PtrVector & result) +void UmlBaseClassInstance::availableAttributes(QVector &result) { UmlCom::send_cmd(_identifier, attributesCmd, (char) 1); - UmlCom::read_item_list((Q3PtrVector &) result); + UmlCom::read_item_list((QVector &) result); } -void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector & result) +void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector &result) { UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier); - UmlCom::read_item_list((Q3PtrVector &) result); + UmlCom::read_item_list((QVector &) 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 v(2); + QVector 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 v(2); + QVector v(2); v.insert(0, relation); v.insert(1, other); diff --git a/genplugouts/CppUtilities/UmlBaseClassInstance.h b/genplugouts/CppUtilities/UmlBaseClassInstance.h index 3dde839de..f6bbba946 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 -#include -#include +#include + + 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 & result); + void attributesValue(QList & result); // Returns the attributes having a value - void relationsValue(Q3ValueList & result); + void relationsValue(QList & result); // Returns all the attributes of the class instance, // including the inherited - void availableAttributes(Q3PtrVector & result); + void availableAttributes(QVector & result); // Returns all the possible relations from the current instance to 'other', including the inherited - void availableRelations(UmlClassInstance * other, Q3PtrVector & result); + void availableRelations(UmlClassInstance * other, QVector & 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 +#include 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 - +#include 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 +#include #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 + // 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 +#include 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 + #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 + 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 + 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..5182640a0 100644 --- a/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.cpp +++ b/genplugouts/CppUtilities/UmlBaseCollaborationDiagramDefinition.cpp @@ -4,7 +4,7 @@ void UmlBaseCollaborationDiagramDefinition::read_() { - Q3PtrDict instances; + QHash instances; unsigned n; unsigned rank; @@ -19,7 +19,7 @@ void UmlBaseCollaborationDiagramDefinition::read_() 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 -#include class UmlClassInstanceReference; class UmlCollaborationMessage; @@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition { public: // return the instances present in the diagram - const Q3PtrVector & instances() const { + const QVector & instances() const { return _instances; } // return the messages present in the diagram, // ordonned following their rank - const Q3PtrVector & messages() const { + const QVector & messages() const { return _messages; } private: - Q3PtrVector _instances; + QVector _instances; - Q3PtrVector _messages; + QVector _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 & instances) +void UmlBaseCollaborationMessage::read_(const QHash &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 -#include + + #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 & instances); + void read_(const QHash &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 & UmlBaseComponent::realizingClasses() +const QVector & UmlBaseComponent::realizingClasses() { read_if_needed_(); return _realizing; } -const Q3PtrVector & UmlBaseComponent::providedClasses() +const QVector & UmlBaseComponent::providedClasses() { read_if_needed_(); return _provided; } -const Q3PtrVector & UmlBaseComponent::requiredClasses() +const QVector & UmlBaseComponent::requiredClasses() { read_if_needed_(); return _required; } -bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector & realizing, const Q3PtrVector & provided, const Q3PtrVector & required) +bool UmlBaseComponent::set_AssociatedClasses(const QVector & realizing, const QVector & provided, const QVector & 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 #include "UmlItem.h" #include "anItemKind.h" -#include -#include - #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 & realizingClasses(); + const QVector & realizingClasses(); // returns (in Java a copy of) the optional provided classes - const Q3PtrVector & providedClasses(); + const QVector & providedClasses(); // returns (in Java a copy of) the optional required classes - const Q3PtrVector & requiredClasses(); + const QVector & 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 & realizing, const Q3PtrVector & provided, const Q3PtrVector & required); + bool set_AssociatedClasses(const QVector & realizing, const QVector & provided, const QVector & 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 _realizing; + QVector _realizing; - Q3PtrVector _provided; + QVector _provided; - Q3PtrVector _required; + QVector _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 + 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 + 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 + 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 + // 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 + 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 + 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 -bool UmlBaseDiagram::saveIn(const Q3CString & s) const +#include +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 + // 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 + 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 + 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 + 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 + #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 +#include 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 + 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 + 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 +#include 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 + #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 + 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 + #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..3e3c569ac 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 & instances) +void UmlBaseFragment::read_covered_(QHash &instances) { unsigned n = UmlCom::read_unsigned(); unsigned rank; @@ -49,7 +49,7 @@ void UmlBaseFragment::read_covered_(Q3PtrDict & insta _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]); } -UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector & fragments) +UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector &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 & fragments) +void UmlBaseFragment::compute_container_(QVector &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 -#include -#include - +#include +#include +#include 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 & compartments() const { + const QVector & 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 & covered() const { + const QVector & covered() const { return _covered; } @@ -52,9 +49,9 @@ class UmlBaseFragment private: UmlFragmentCompartment * _container; - Q3PtrVector _compartments; + QVector _compartments; - Q3CString _name; + QByteArray _name; int _x; @@ -66,9 +63,9 @@ class UmlBaseFragment UmlDiagram * _refer; - Q3CString _arguments; + QByteArray _arguments; - Q3PtrVector _covered; + QVector _covered; // internal, don't call it void read_(); @@ -81,15 +78,15 @@ class UmlBaseFragment //internal, do NOT use it - void read_covered_(Q3PtrDict & instances); + void read_covered_(QHash &instances); // internal - static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector & fragments); + static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector & fragments); private: // internal - static void compute_container_(Q3PtrVector & fragments); + static void compute_container_(QVector & 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 +#include 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 -#include + + class UmlFragment; class UmlBaseFragment; @@ -27,23 +27,23 @@ class UmlBaseFragmentCompartment } // the texts placed in the compartment - const Q3PtrVector & texts() const { + const QVector & texts() const { return _texts; } // return the fragments contained in the compartment, // may be none - const Q3PtrVector & contained() const { + const QVector & 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 _contained; + QVector _contained; int _rank; - Q3PtrVector _texts; + QVector _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 + 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 + 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..6dcb6e096 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 +#include -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 UmlBaseItem::children() { - if (_children == 0) - read_children_(); - - return *_children; +const QVector 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 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 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 UmlBaseItem::referencedBy() { - UmlCom::send_cmd(_identifier, referencedByCmd); - - Q3PtrVector result; - - UmlCom::read_item_list(result); - return result; +const QVector UmlBaseItem::referencedBy() { + UmlCom::send_cmd(_identifier, referencedByCmd); + + QVector 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 (unsigned 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 UmlBaseItem::markedItems() +const QVector UmlBaseItem::markedItems() { - UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd); - - Q3PtrVector result; - - UmlCom::read_item_list(result); - return result; + UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd); + + QVector result; + + UmlCom::read_item_list(result); + return result; } -Q3PtrDict UmlBaseItem::_all(997); +QHash 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; - - 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; + + 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'; + //cout << "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 -#include -#include -#include #include "Tools/ApiCmd.h" - #include "aVisibility.h" #include "aDirection.h" - +#include +#include 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 children(); + const QVector 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 properties(); + const QHash 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 referencedBy(); + const QVector 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 markedItems(); + static const QVector 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 * _children; + QVector * _children; - Q3Dict _dict; + QHash _dict; - static Q3PtrDict _all; + static QHash _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 + 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 + 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..a68c1dd50 100644 --- a/genplugouts/CppUtilities/UmlBaseMessage.cpp +++ b/genplugouts/CppUtilities/UmlBaseMessage.cpp @@ -4,7 +4,7 @@ #include "UmlClassInstanceReference.h" #include "UmlOperation.h" -void UmlBaseMessage::read_(const Q3PtrDict & instances) +void UmlBaseMessage::read_(const QHash & instances) { _operation = (UmlOperation *) UmlBaseItem::read_(); 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 -#include - +#include +#include 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 & instances); + void read_(const QHash &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 + 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 + 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 + 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 +#include -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 + 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 -#include +#include +#include #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 UmlBaseOperation::params() { +const QList 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 UmlBaseOperation::exceptions() { +const QList 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 UmlBaseOperation::methods() const { - Q3PtrVector l; +const QVector UmlBaseOperation::methods() const { + QVector 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..71253514d 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 -#include -#include +#include + + #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 params(); + const QList 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 exceptions(); + const QList 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 methods() const; + const QVector 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 @@ -145,7 +145,7 @@ class UmlBaseOperation : public UmlClassMember { // 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 // 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 @@ -214,7 +214,7 @@ class UmlBaseOperation : public UmlClassMember { // 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 // 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 @@ -275,7 +275,7 @@ class UmlBaseOperation : public UmlClassMember { // 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 // 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 @@ -328,7 +328,7 @@ class UmlBaseOperation : public UmlClassMember { // 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 // 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 _params; + QList _params; - Q3ValueList _exceptions; + QList _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 +#include 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..9f89ab192 100644 --- a/genplugouts/CppUtilities/UmlBasePackage.h +++ b/genplugouts/CppUtilities/UmlBasePackage.h @@ -4,7 +4,7 @@ #include "UmlItem.h" #include "anItemKind.h" -#include + 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 @@ -177,7 +177,7 @@ class UmlBasePackage : public UmlItem //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 + #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 & UmlBaseParameterSet::pins() +const QVector & UmlBaseParameterSet::pins() { read_if_needed_(); return _pins; } -bool UmlBaseParameterSet::set_Pins(const Q3PtrVector & v) +bool UmlBaseParameterSet::set_Pins(const QVector & v) { - UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector &) v); + UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector &) 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 &) _pins); + UmlCom::read_item_list((QVector &) _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 #include "UmlItem.h" #include "anItemKind.h" -#include -#include 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 & pins(); + const QVector & pins(); // set the pins - bool set_Pins(const Q3PtrVector & v); + bool set_Pins(const QVector & 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 _pins; + QVector _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 + #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 + 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 +#include 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 + #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 + 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..2f77977fc 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 +#include 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 instances; + QHash 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(); @@ -68,7 +68,7 @@ void UmlBaseSequenceDiagramDefinition::read_() 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 + class UmlClassInstanceReference; class UmlSequenceMessage; @@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition { public: // return the instances present in the diagram - const Q3PtrVector & instances() const { + const QVector & instances() const { return _instances; } // return the messages present in the diagram, // ordonned following the sending time - const Q3PtrVector & messages() const { + const QVector & messages() const { return _messages; } // return the fragments present in the diagram - const Q3PtrVector & fragments() const { + const QVector & fragments() const { return _fragments; } private: - Q3PtrVector _instances; + QVector _instances; - Q3PtrVector _messages; + QVector _messages; - Q3PtrVector _fragments; + QVector _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 & instances, const Q3PtrVector & fragments) +void UmlBaseSequenceMessage::read_(const QHash &instances, const QVector &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 -#include -#include + + + #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 & instances, const Q3PtrVector & fragments); + void read_(const QHash &instances, const QVector &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 + 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 +#include 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 + #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 +#include 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 + 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 + 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 & subjects) +UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector &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 -#include - +#include +#include 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 & subjects); + static UmlSubject * get_container_(int x, int y, int w, int h, const QVector &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 + 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 +#include 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 + #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 +#include -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 - +#include 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 +#include 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 + 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..536dd6a90 100644 --- a/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.cpp +++ b/genplugouts/CppUtilities/UmlBaseUseCaseAssociation.cpp @@ -4,7 +4,7 @@ #include "UmlUseCaseReference.h" #include "UmlClass.h" -void UmlBaseUseCaseAssociation::read_(const Q3PtrDict & useCases) +void UmlBaseUseCaseAssociation::read_(const QHash & useCases) { _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()]; _actor = (UmlClass *) UmlBaseItem::read_(); 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 -#include - +#include +#include 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 & useCases); + void read_(const QHash &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 + 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..364fb88e6 100644 --- a/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.cpp +++ b/genplugouts/CppUtilities/UmlBaseUseCaseDiagramDefinition.cpp @@ -4,7 +4,7 @@ void UmlBaseUseCaseDiagramDefinition::read_() { - Q3PtrDict ucrefs; + QHash 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); @@ -44,7 +44,7 @@ void UmlBaseUseCaseDiagramDefinition::read_() 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 - +#include class UmlUseCaseReference; class UmlClass; class UmlUseCaseAssociation; @@ -23,41 +21,41 @@ class UmlBaseUseCaseDiagramDefinition { public: // return the use cases present in the diagram - const Q3PtrVector & useCases() const { + const QVector & useCases() const { return _use_cases; } // return the actors present in the diagram - const Q3PtrVector & actors() const { + const QVector & actors() const { return _actors; } // return the associations between actor and use case present in the diagram - const Q3PtrVector & associations() const { + const QVector & associations() const { return _rels; } // return the fragments present in the diagram - const Q3PtrVector & fragments() const { + const QVector & fragments() const { return _fragments; } // return the subjects present in the diagram - const Q3PtrVector & subjects() const { + const QVector & subjects() const { return _subjects; } private: - Q3PtrVector _use_cases; + QVector _use_cases; - Q3PtrVector _actors; + QVector _actors; - Q3PtrVector _rels; + QVector _rels; - Q3PtrVector _fragments; + QVector _fragments; - Q3PtrVector _subjects; + QVector _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 & fragments, const Q3PtrVector & subjects) +void UmlBaseUseCaseReference::read_(const QVector &fragments, const QVector &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 - +#include class UmlUseCase; class UmlFragmentCompartment; class UmlSubject; @@ -46,7 +44,7 @@ class UmlBaseUseCaseReference int _h; // internal, don't call it - void read_(const Q3PtrVector & fragments, const Q3PtrVector & subjects); + void read_(const QVector & fragments, const QVector & 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 + 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 + 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 -#include // 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..e98fa90f3 100644 --- a/genplugouts/CppUtilities/UmlClass.cpp +++ b/genplugouts/CppUtilities/UmlClass.cpp @@ -8,8 +8,8 @@ #include "UmlCom.h" //Added by qt3to4: -#include -#include +#include +#include #include "Logging/QsLog.h" class FunctionTracer { @@ -30,10 +30,10 @@ class FunctionTracer void UmlClass::utilities() { TRACE_FUNCTION; - const Q3PtrVector ch = children(); + const QVector 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; @@ -41,16 +41,15 @@ void UmlClass::utilities() for (unsigned 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 params = - ((UmlOperation *) ch[i])->params(); + const QList 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 params = + const QList 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 + // 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 + // 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 + 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 + // 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 + #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 + // 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 + // 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..2b5206d40 100644 --- a/genplugouts/CppUtilities/UmlCom.cpp +++ b/genplugouts/CppUtilities/UmlCom.cpp @@ -1,10 +1,9 @@ #include "UmlCom.h" -#include -//Added by qt3to4: -#include - +#include +#include +#include #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,7 +82,7 @@ void UmlCom::close() sock = 0; } -Q3SocketDevice * UmlCom::sock; +QTcpSocket * UmlCom::sock; char * UmlCom::buffer_in; @@ -156,8 +158,9 @@ void UmlCom::read_size() 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; @@ -206,8 +209,9 @@ void UmlCom::read_buffer(unsigned int len) QLOG_INFO() << "Allocated address" << (size_t) buffer_in; for (;;) { - while(sock->bytesAvailable() != len); - nread = sock->readBlock(p, len); + + while(sock->bytesAvailable() != len)sock->waitForReadyRead(); + nread = sock->read(p, len); p += nread; QLOG_INFO() << "nread = " + QString::number(nread); @@ -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 & l) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l) { #ifdef TRACE - QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l)\n"; + QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l)\n"; #endif write_char(onInstanceCmd); @@ -629,10 +633,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & l3) { #ifdef TRACE - QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3)\n"; + QLOG_INFO() << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l1, const QVector & l2, const QVector & l3)\n"; #endif write_char(onInstanceCmd); @@ -735,7 +739,7 @@ unsigned int UmlCom::read_unsigned() return value; } -void UmlCom::read_item_list(Q3PtrVector & v) +void UmlCom::read_item_list(QVector & v) { unsigned n = read_unsigned(); @@ -746,10 +750,10 @@ void UmlCom::read_item_list(Q3PtrVector & 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 & +void UmlCom::fatal_error(const QByteArray & #ifdef DEBUG_BOUML msg #endif @@ -778,7 +782,7 @@ void UmlCom::flush() for (;;) { - int sent = sock->writeBlock(p_buffer_out, len); + int sent = sock->write(p_buffer_out, len); if (sent == -1) { diff --git a/genplugouts/CppUtilities/UmlCom.h b/genplugouts/CppUtilities/UmlCom.h index a57c56a9e..88204159c 100644 --- a/genplugouts/CppUtilities/UmlCom.h +++ b/genplugouts/CppUtilities/UmlCom.h @@ -1,15 +1,10 @@ #ifndef _UMLCOM_H #define _UMLCOM_H - - -#include - - #include "anItemKind.h" #include "aRelationKind.h" -#include -#include + + #include #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,7 +73,7 @@ class UmlCom static void close(); private: - static Q3SocketDevice * sock; + static QTcpSocket * sock; static char * buffer_in; @@ -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 & l); - static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & 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 & v); + static void read_item_list(QVector & 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 + // 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 + // 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 + // 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 + // 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 + // 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 + // 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 + 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 + 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 + 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 + 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 + // 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 + 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 + 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 + // 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 + //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 + // 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 + // 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 + 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 + // 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 + // 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 + #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 + 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 + #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 + 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 + // 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 + // 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..35987271c 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 UmlSettings::artifactDescription() +#include +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,25 +147,25 @@ 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 UmlSettings::_map_builtins; +QHash UmlSettings::_map_builtins; UmlBuiltin * UmlSettings::_builtins; -Q3Dict UmlSettings::_map_relation_attribute_stereotypes; +QHash UmlSettings::_map_relation_attribute_stereotypes; UmlStereotype * UmlSettings::_relation_attribute_stereotypes; -Q3Dict UmlSettings::_map_class_stereotypes; +QHash UmlSettings::_map_class_stereotypes; UmlStereotype * UmlSettings::_class_stereotypes; @@ -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,7 +281,7 @@ 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; @@ -289,11 +289,11 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s) 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,7 +318,7 @@ 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; @@ -326,11 +326,11 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s) 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,7 +353,7 @@ 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; @@ -361,11 +361,11 @@ UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s) 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 +#include #include "aLanguage.h" -#include +#include 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 _map_relation_attribute_stereotypes; - static Q3Dict _map_builtins; + static QHash _map_builtins; static UmlBuiltin * _builtins; - static Q3Dict _map_relation_attribute_stereotypes; + static QHash _map_relation_stereotypes; static UmlStereotype * _relation_attribute_stereotypes; - static Q3Dict _map_class_stereotypes; + static QHash _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 + 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 + 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 -#include // 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 + // 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 + // 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 + // 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 + 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 +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 +#include +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..0a5059d3a --- /dev/null +++ b/genplugouts/CppUtilities/hhbox.cpp @@ -0,0 +1,29 @@ +#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); +} + +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 +#include +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..0a4cd1997 --- /dev/null +++ b/genplugouts/CppUtilities/vvbox.cpp @@ -0,0 +1,25 @@ +#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); +} +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 +#include +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 +#include 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 CppSettings::_map_includes; +QHash 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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _map_includes; protected: diff --git a/genplugouts/FileControl/Dialog.cpp b/genplugouts/FileControl/Dialog.cpp index 5ec0729e9..b33229829 100644 --- a/genplugouts/FileControl/Dialog.cpp +++ b/genplugouts/FileControl/Dialog.cpp @@ -8,73 +8,75 @@ #include #include #include -#include +#include #include #include #include #include -//Added by qt3to4: -#include -#include +#include +#include #include #include -Dialog::Dialog(bool ci, Q3CString & cmd, BooL & rec, BooL & reload) - : QDialog(0, 0, TRUE), _cmd(cmd), _rec(rec), _reload(reload) +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); @@ -86,10 +88,10 @@ Dialog::Dialog(bool ci, Q3CString & cmd, BooL & rec, BooL & reload) void Dialog::polish() { - QDialog::polish(); + QDialog::ensurePolished(); QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); - settings.setIniCodec(QTextCodec::codecForName("UTF-8")); + settings.setIniCodec("UTF-8"); int l, t, r, b; l = settings.value("Desktop/left", -1).toInt(); r = settings.value("Desktop/right", -1).toInt(); @@ -112,10 +114,10 @@ void Dialog::polish() 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 + #include 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 ed9a19ea6..2d171489e 100644 --- a/genplugouts/FileControl/FileControl.pro +++ b/genplugouts/FileControl/FileControl.pro @@ -10,7 +10,7 @@ CONFIG(Release, Debug|Release) { CONFIG += qt Release QMAKE_POST_LINK = " " } -DEFINES = BooL=bool +DEFINES += BooL=bool HEADERS = ./aVisibility.h \ ./UmlBaseExtraClassMember.h \ ./UmlBaseComponentDiagram.h \ @@ -122,7 +122,8 @@ HEADERS = ./aVisibility.h \ ./UmlBaseDeployment.h \ ./UmlStereotype.h \ ./UmlDeploymentDiagram.h \ - ./UmlUseCase.h + ./UmlUseCase.h \ + hhbox.h SOURCES = ./aVisibility.cpp \ ./UmlBaseExtraClassMember.cpp \ ./UmlBaseComponentDiagram.cpp \ @@ -235,12 +236,13 @@ 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 +QT += testlib DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/file_control 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 +#include 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 IdlSettings::_map_includes; +QHash 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 + #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _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 +#include 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 JavaSettings::_map_imports; +QHash 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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _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 + 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 + 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 + // 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 + // 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 +#include 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 & UmlBaseArtifact::associatedClasses() +const QVector & 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 & l) +bool UmlBaseArtifact::set_AssociatedClasses(const QVector & l) { UmlCom::send_cmd(_identifier, setAssocClassesCmd, l); @@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector & l) return FALSE; } -const Q3PtrVector & UmlBaseArtifact::associatedArtifacts() +const QVector & 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 -#include +#include + #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 <> - const Q3PtrVector & associatedClasses(); + const QVector & 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 <> // // On error return FALSE in C++, produce a RuntimeException in Java - bool set_AssociatedClasses(const Q3PtrVector & l); + bool set_AssociatedClasses(const QVector & l); // returns (in Java a copy of) the associated artifacts list // significant when the artifact is not stereotyped <> - const Q3PtrVector & associatedArtifacts(); + const QVector & 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 _assoc_classes; + QVector _assoc_classes; - Q3PtrVector _associated; + QVector _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 +#include 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 + #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 + 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..f9f481637 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 -#include +#include +#include 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 UmlBaseClass::formals() +QList UmlBaseClass::formals() { UmlCom::send_cmd(_identifier, formalsCmd); - Q3ValueList formals; + QList 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 UmlBaseClass::actuals() +QList UmlBaseClass::actuals() { UmlCom::send_cmd(_identifier, actualsCmd); - Q3ValueList actuals; + QList 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 UmlBaseClass::associatedComponents() +const QVector UmlBaseClass::associatedComponents() { UmlCom::send_cmd(_identifier, assocComponentCmd); - Q3PtrVector result; + QVector 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,13 +325,13 @@ 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 ch = children(); - Q3CString destr = "~" + name(); + const QVector ch = children(); + QByteArray destr = "~" + name(); for (unsigned i = 0; i != ch.size(); i += 1) { if (ch[i]->kind() == anOperation) { @@ -345,9 +345,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s) return TRUE; } -Q3Dict UmlBaseClass::_classes(1001); +QHash 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..ebda33457 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 -#include -#include -#include +#include + + + #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 formals(); + QList 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 actuals(); + QList 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 associatedComponents(); + const QVector 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 _classes; + static QHash _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 + 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 +#include #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 + // 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 + #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 + 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 + 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 & UmlBaseComponent::realizedClasses() +const QVector & UmlBaseComponent::realizedClasses() { read_if_needed_(); return _realized; } -const Q3PtrVector & UmlBaseComponent::providedClasses() +const QVector & UmlBaseComponent::providedClasses() { read_if_needed_(); return _provided; } -const Q3PtrVector & UmlBaseComponent::requiredClasses() +const QVector & UmlBaseComponent::requiredClasses() { read_if_needed_(); return _required; } -bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector & realized, const Q3PtrVector & provided, const Q3PtrVector & required) +bool UmlBaseComponent::set_AssociatedClasses(const QVector & realized, const QVector & provided, const QVector & 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 #include "UmlItem.h" #include "anItemKind.h" -#include -#include + + #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 & realizedClasses(); + const QVector & realizedClasses(); // returns (in Java a copy of) the optional provided classes - const Q3PtrVector & providedClasses(); + const QVector & providedClasses(); // returns (in Java a copy of) the optional required classes - const Q3PtrVector & requiredClasses(); + const QVector & 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 & realized, const Q3PtrVector & provided, const Q3PtrVector & required); + bool set_AssociatedClasses(const QVector & realized, const QVector & provided, const QVector & 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 _realized; + QVector _realized; - Q3PtrVector _provided; + QVector _provided; - Q3PtrVector _required; + QVector _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 + 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 + 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 + 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 + // 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 + 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 + 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 -bool UmlBaseDiagram::saveIn(const Q3CString & s) const +#include +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 + // 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 + 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 + 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 +#include 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 + 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 + 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 + 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 + #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 + 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..66100204d 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 +#include -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 UmlBaseItem::children() +const QVector 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 UmlBaseItem::properties() +const QHash 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 UmlBaseItem::referencedBy() +const QVector UmlBaseItem::referencedBy() { UmlCom::send_cmd(_identifier, referencedByCmd); - Q3PtrVector result; + QVector result; UmlCom::read_item_list(result); return result; @@ -228,17 +228,17 @@ bool UmlBaseItem::isToolRunning(int id) return UmlCom::read_bool(); } -const Q3PtrVector UmlBaseItem::markedItems() +const QVector UmlBaseItem::markedItems() { UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd); - Q3PtrVector result; + QVector result; UmlCom::read_item_list(result); return result; } -Q3PtrDict UmlBaseItem::_all(997); +QHash 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; + _children = new QVector; 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); @@ -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 #include "anItemKind.h" -#include -#include -#include -#include + + + + //#include "OnInstanceCmd.h" #include "aVisibility.h" #include "aDirection.h" +#include 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 children(); + const QVector 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 properties(); + const QHash 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 referencedBy(); + const QVector 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 markedItems(); + static const QVector 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 * _children; + QVector * _children; + + QHash _dict; + - Q3Dict _dict; + static QHash _all; - static Q3PtrDict _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 + 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 + 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 + 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 + 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 -#include +#include +#include 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 UmlBaseOperation::params() +const QList 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 UmlBaseOperation::exceptions() +const QList 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..6fcbee8ba 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 -#include +#include + #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 params(); + const QList 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 exceptions(); + const QList 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 @@ -133,7 +133,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 @@ -182,7 +182,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 _params; + QList _params; - Q3ValueList _exceptions; + QList _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 +#include 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..79fc01eac 100644 --- a/genplugouts/FileControl/UmlBasePackage.h +++ b/genplugouts/FileControl/UmlBasePackage.h @@ -4,7 +4,7 @@ #include "UmlItem.h" #include "anItemKind.h" -#include + 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 @@ -132,7 +132,7 @@ class UmlBasePackage : public UmlItem //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 + 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 +#include 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 + 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 + 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 + 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 +#include 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 + #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 +#include 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 + 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 + 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 + 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 +#include 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 + #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 + 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 + 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 + 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 +#include // 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 + // 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 + // 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 + // 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 + #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 + // 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 + // 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..1f32dc7aa 100644 --- a/genplugouts/FileControl/UmlCom.cpp +++ b/genplugouts/FileControl/UmlCom.cpp @@ -1,20 +1,19 @@ #include "UmlCom.h" - -#include +#include //Added by qt3to4: -#include - +#include #include "UmlCom.h" #include "UmlItem.h" #include "UmlTypeSpec.h" #include "UmlClass.h" #include "UmlSettings.h" #include "Tools/ApiCmd.h" +#include 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,7 +66,7 @@ void UmlCom::close() sock = 0; } -Q3SocketDevice * UmlCom::sock; +QTcpSocket * UmlCom::sock; char * UmlCom::buffer_in; @@ -109,9 +110,9 @@ void UmlCom::read_if_needed() 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"; #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]); } } @@ -132,7 +133,7 @@ void UmlCom::read_buffer(unsigned int len) 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 @@ -152,7 +153,7 @@ void UmlCom::read_buffer(unsigned int len) break; p += nread; - sock->waitForMore(100); + sock->waitForReadyRead(100); } #ifdef TRACE @@ -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 & l) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l) { #ifdef TRACE - cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l)\n"; + cout << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l)\n"; #endif write_char(onInstanceCmd); @@ -533,10 +534,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & l3) { #ifdef TRACE - cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3)\n"; + cout << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l1, const QVector & l2, const QVector & l3)\n"; #endif write_char(onInstanceCmd); @@ -630,12 +631,12 @@ 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 & v) +void UmlCom::read_item_list(QVector & v) { unsigned n = read_unsigned(); @@ -646,14 +647,15 @@ void UmlCom::read_item_list(Q3PtrVector & 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_BOUML msg -#endif - ) + #endif + ) { #ifdef DEBUG_BOUML cout << msg << '\n'; @@ -676,7 +678,7 @@ void UmlCom::flush() p_buffer_out = buffer_out; for (;;) { - int sent = sock->writeBlock(p_buffer_out, len); + int 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..26c838b20 100644 --- a/genplugouts/FileControl/UmlCom.h +++ b/genplugouts/FileControl/UmlCom.h @@ -2,21 +2,21 @@ #define _UMLCOM_H -#include +#include //#include "CmdFamily.h" //#include "OnInstanceCmd.h" #include "anItemKind.h" #include "aRelationKind.h" -#include -#include + + #include class UmlItem; class UmlTypeSpec; class UmlClass; -class Q3SocketDevice; +class QTcpSocket; class UmlItem; class UmlTypeSpec; class UmlClass; @@ -63,7 +63,7 @@ class UmlCom static void close(); private: - static Q3SocketDevice * sock; + static QTcpSocket * sock; static char * buffer_in; @@ -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 & l); - static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & 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 & v); + static void read_item_list(QVector & 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 + // 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 + // 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 + // 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 + // 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 + // 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 + // 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 + 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 + 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 + // 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..6b11626a2 100644 --- a/genplugouts/FileControl/UmlItem.cpp +++ b/genplugouts/FileControl/UmlItem.cpp @@ -12,14 +12,14 @@ void UmlItem::fileControl(bool) UmlCom::trace("Error : must be applied on a Package"); } -void UmlItem::getFiles(Q3Dict & files, unsigned rec) +void UmlItem::getFiles(QHash &files, unsigned rec) { QFileInfo fi(supportFile()); if (fi.exists()) - files.replace(fi.fileName(), (void *) 1); + files.insert(fi.fileName(), (void *) 1); - const Q3PtrVector ch = children(); + const QVector ch = children(); unsigned index; for (index = 0; index != ch.size(); index += 1) 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 -#include + + // 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 & files, unsigned rec); + virtual void getFiles(QHash & 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 + //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 + // 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 + // 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 #include //Added by qt3to4: -#include +#include #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 files; + QHash files; getFiles(files, (rec) ? ~0u : 1); @@ -38,31 +38,32 @@ void UmlPackage::fileControl(bool ci) getAuxFiles(files); // apply the command on each file - Q3DictIterator it(files); + QHashIterator 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 & files, unsigned rec) +void UmlPackage::getFiles(QHash &files, unsigned rec) { if (rec != 0) UmlItem::getFiles(files, rec - 1); } -void UmlPackage::getAuxFiles(Q3Dict & files) +void UmlPackage::getAuxFiles(QHash & files) { static const char * aux[] = { "cpp_includes", "generation_settings", "idl_includes", @@ -87,13 +88,13 @@ void UmlPackage::getAuxFiles(Q3Dict & 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 -#include + + // 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 & files, unsigned rec); + virtual void getFiles(QHash & files, unsigned rec); //Add auxiliary files in 'files' //must be applied on the project - virtual void getAuxFiles(Q3Dict & files); + virtual void getAuxFiles(QHash & 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 +#include // 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 + #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 + 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 + // 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 + // 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..0a04b4b22 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 UmlSettings::artifactDescription() +#include +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,25 +104,25 @@ 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 UmlSettings::_map_builtins; +QHash UmlSettings::_map_builtins; UmlBuiltin * UmlSettings::_builtins; -Q3Dict UmlSettings::_map_relation_stereotypes; +QHash UmlSettings::_map_relation_stereotypes; UmlStereotype * UmlSettings::_relation_stereotypes; -Q3Dict UmlSettings::_map_class_stereotypes; +QHash UmlSettings::_map_class_stereotypes; UmlStereotype * UmlSettings::_class_stereotypes; @@ -136,7 +136,7 @@ void UmlSettings::read_() _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,7 +229,7 @@ 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; @@ -237,7 +237,7 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s) 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,7 +265,7 @@ 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; @@ -273,7 +273,7 @@ UmlStereotype * UmlSettings::add_rel_stereotype(const Q3CString & s) 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,7 +298,7 @@ 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; @@ -306,7 +306,7 @@ UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s) 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 +#include + -#include -#include 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 _map_builtins; + static QHash _map_builtins; static UmlBuiltin * _builtins; - static Q3Dict _map_relation_stereotypes; + static QHash _map_relation_stereotypes; static UmlStereotype * _relation_stereotypes; - static Q3Dict _map_class_stereotypes; + static QHash _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 + 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 + 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 +#include // 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 + 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 +#include -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 -#include 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 + // 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 + // 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 + // 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 +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 +#include +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..0a5059d3a --- /dev/null +++ b/genplugouts/FileControl/hhbox.cpp @@ -0,0 +1,29 @@ +#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); +} + +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 +#include +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..0a4cd1997 --- /dev/null +++ b/genplugouts/FileControl/vvbox.cpp @@ -0,0 +1,25 @@ +#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); +} +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 +#include +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..558566c34 100644 --- a/genplugouts/GlobalChange/Context.cpp +++ b/genplugouts/GlobalChange/Context.cpp @@ -1,14 +1,14 @@ #include "Context.h" //Added by qt3to4: -#include +#include -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) { @@ -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 -#include 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..c7a59b063 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 +#include 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,7 +1118,7 @@ bool CppSettings::_is_force_namespace_gen; bool CppSettings::_is_generate_javadoc_comment; -Q3Dict CppSettings::_map_includes; +QHash CppSettings::_map_includes; void CppSettings::read_() { @@ -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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _map_includes; protected: diff --git a/genplugouts/GlobalChange/Dialog.cpp b/genplugouts/GlobalChange/Dialog.cpp index abdc8e746..5857d6248 100644 --- a/genplugouts/GlobalChange/Dialog.cpp +++ b/genplugouts/GlobalChange/Dialog.cpp @@ -9,20 +9,19 @@ #include #include #include -#include -#include +#include +#include #include #include //#include //[jasa] has compiler errors. //[jasa] including q3buttongroup.h instead seems to work. -#include -#include -#include +#include +#include "vgridbox.h" +#include "gridbox.h" #include -//Added by qt3to4: -#include +#include #include -#include +#include #include #include "UmlCom.h" #include "Context.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,14 +302,14 @@ Q3CString Dialog::digest(const QString s) void Dialog::polish() { - QDialog::polish(); + QDialog::ensurePolished(); QSize sz = size(); // width = height resize(sz.height(), sz.height()); QSettings settings(QSettings::IniFormat, QSettings::UserScope, "DoUML", "settings"); - settings.setIniCodec(QTextCodec::codecForName("UTF-8")); + settings.setIniCodec("UTF-8"); int l, t, r, b; l = settings.value("Desktop/left", -1).toInt(); r = settings.value("Desktop/right", -1).toInt(); 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 + #include #include @@ -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 + 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 e34bb7eae..fa079f3d3 100644 --- a/genplugouts/GlobalChange/GlobalChange.pro +++ b/genplugouts/GlobalChange/GlobalChange.pro @@ -10,7 +10,7 @@ CONFIG(Release, Debug|Release) { CONFIG += qt Release QMAKE_POST_LINK = " " } -DEFINES = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON +DEFINES += WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON HEADERS = ./UmlBaseUseCaseAssociation.h \ ./UmlActivityDiagram.h \ ./UmlForkPseudoState.h \ @@ -208,7 +208,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 \ @@ -407,12 +412,17 @@ 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 +QT += testlib DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/global_change diff --git a/genplugouts/GlobalChange/IdlSettings.cpp b/genplugouts/GlobalChange/IdlSettings.cpp index de9092f14..5c1e74c79 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 +#include 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,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 IdlSettings::_map_includes; +QHash 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/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 + #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _map_includes; protected: diff --git a/genplugouts/GlobalChange/JavaSettings.cpp b/genplugouts/GlobalChange/JavaSettings.cpp index e95f2d595..1ca95db04 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 +#include 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,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 JavaSettings::_map_imports; +QHash 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/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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _map_imports; protected: diff --git a/genplugouts/GlobalChange/PhpSettings.cpp b/genplugouts/GlobalChange/PhpSettings.cpp index 2d453b551..2275a94a3 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 +#include #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_() { @@ -497,6 +511,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/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 + #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..b2e752937 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 +#include 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 PythonSettings::_map_imports; +QHash PythonSettings::_map_imports; void PythonSettings::read_() { @@ -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 + #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _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 -#include 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + // 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 + 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 + 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 + 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 + 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 + 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 +#include 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 + 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 +#include 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 + 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 + 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 +#include 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 + 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 +#include -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 + 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 +#include 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 + #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 + 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 + 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 + 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 + 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 +#include 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 + #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 +#include 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 + 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 + 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 + 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 +#include 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 & UmlBaseArtifact::associatedClasses() +const QVector & 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 & l) +bool UmlBaseArtifact::set_AssociatedClasses(const QVector & l) { - UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const Q3PtrVector &) l); + UmlCom::send_cmd(_identifier, setAssocClassesCmd, (const QVector &) l); if (UmlCom::read_bool()) { if (_defined) @@ -102,7 +103,7 @@ bool UmlBaseArtifact::set_AssociatedClasses(const Q3PtrVector & l) return FALSE; } -const Q3PtrVector & UmlBaseArtifact::associatedArtifacts() +const QVector & 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 -#include +#include + #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 <> - const Q3PtrVector & associatedClasses(); + const QVector & 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 <> // // On error return FALSE in C++, produce a RuntimeException in Java - bool set_AssociatedClasses(const Q3PtrVector & l); + bool set_AssociatedClasses(const QVector & l); // returns (in Java a copy of) the associated artifacts list // significant when the artifact is not stereotyped <> - const Q3PtrVector & associatedArtifacts(); + const QVector & 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 _assoc_classes; + QVector _assoc_classes; - Q3PtrVector _associated; + QVector _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 +#include 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 + #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 + 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..62e414f35 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 -#include +#include +#include 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 UmlBaseClass::formals() +QList UmlBaseClass::formals() { UmlCom::send_cmd(_identifier, formalsCmd); - Q3ValueList formals; + QList 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 UmlBaseClass::actuals() +QList UmlBaseClass::actuals() { UmlCom::send_cmd(_identifier, actualsCmd); - Q3ValueList actuals; + QList 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 UmlBaseClass::associatedComponents() +const QVector UmlBaseClass::associatedComponents() { UmlCom::send_cmd(_identifier, assocComponentCmd); - Q3PtrVector result; + QVector 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,13 +403,13 @@ 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 ch = children(); - Q3CString destr = "~" + name(); + const QVector ch = children(); + QByteArray destr = "~" + name(); for (unsigned i = 0; i != ch.size(); i += 1) { if (ch[i]->kind() == anOperation) { @@ -423,9 +423,9 @@ bool UmlBaseClass::set_Name(const Q3CString & s) return TRUE; } -Q3Dict UmlBaseClass::_classes(1001); +QHash 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..29b021671 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 -#include -#include -#include +#include + + + #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 formals(); + QList 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 actuals(); + QList 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 associatedComponents(); + const QVector 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 _classes; + static QHash _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 + 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 +#include anItemKind UmlBaseClassInstance::kind() { @@ -46,7 +46,7 @@ bool UmlBaseClassInstance::set_Type(UmlClass * v) else return FALSE; } -void UmlBaseClassInstance::attributesValue(Q3ValueList & result) +void UmlBaseClassInstance::attributesValue(QList & result) { UmlCom::send_cmd(_identifier, attributesCmd, (char) 0); @@ -61,7 +61,7 @@ void UmlBaseClassInstance::attributesValue(Q3ValueList & result) } } -void UmlBaseClassInstance::relationsValue(Q3ValueList & result) +void UmlBaseClassInstance::relationsValue(QList & result) { UmlCom::send_cmd(_identifier, relationsCmd, (void *) 0); @@ -76,16 +76,16 @@ void UmlBaseClassInstance::relationsValue(Q3ValueList & result) } } -void UmlBaseClassInstance::availableAttributes(Q3PtrVector & result) +void UmlBaseClassInstance::availableAttributes(QVector &result) { UmlCom::send_cmd(_identifier, attributesCmd, (char) 1); - UmlCom::read_item_list((Q3PtrVector &) result); + UmlCom::read_item_list((QVector &) result); } -void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, Q3PtrVector & result) +void UmlBaseClassInstance::availableRelations(UmlClassInstance * other, QVector &result) { UmlCom::send_cmd(_identifier, relationsCmd, other->_identifier); - UmlCom::read_item_list((Q3PtrVector &) result); + UmlCom::read_item_list((QVector &) 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 v(2); + QVector 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 v(2); + QVector v(2); v.insert(0, relation); v.insert(1, other); diff --git a/genplugouts/GlobalChange/UmlBaseClassInstance.h b/genplugouts/GlobalChange/UmlBaseClassInstance.h index 3dde839de..00256b71c 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 -#include -#include +#include + + 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 & result); + void attributesValue(QList & result); // Returns the attributes having a value - void relationsValue(Q3ValueList & result); + void relationsValue(QList & result); // Returns all the attributes of the class instance, // including the inherited - void availableAttributes(Q3PtrVector & result); + void availableAttributes(QVector & result); // Returns all the possible relations from the current instance to 'other', including the inherited - void availableRelations(UmlClassInstance * other, Q3PtrVector & result); + void availableRelations(UmlClassInstance * other, QVector &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 +#include 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 -#include 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 +#include #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 + // 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 +#include 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 + #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 + 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 + 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..2a8c9b76f 100644 --- a/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.cpp +++ b/genplugouts/GlobalChange/UmlBaseCollaborationDiagramDefinition.cpp @@ -4,7 +4,7 @@ void UmlBaseCollaborationDiagramDefinition::read_() { - Q3PtrDict instances; + QHash instances; unsigned n; unsigned rank; @@ -19,7 +19,7 @@ void UmlBaseCollaborationDiagramDefinition::read_() 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 // to avoid compiler warning #include "UmlCollaborationMessage.h" #include "UmlClassInstanceReference.h" -#include + class UmlClassInstanceReference; class UmlCollaborationMessage; @@ -16,21 +16,21 @@ class UmlBaseCollaborationDiagramDefinition { public: // return the instances present in the diagram - const Q3PtrVector & instances() const { + const QVector & instances() const { return _instances; } // return the messages present in the diagram, // ordonned following their rank - const Q3PtrVector & messages() const { + const QVector & messages() const { return _messages; } private: - Q3PtrVector _instances; + QVector _instances; - Q3PtrVector _messages; + QVector _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 & instances) +void UmlBaseCollaborationMessage::read_(const QHash & 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 -#include + + #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 & instances); + void read_(const QHash & 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 & UmlBaseComponent::realizingClasses() +const QVector & UmlBaseComponent::realizingClasses() { read_if_needed_(); return _realizing; } -const Q3PtrVector & UmlBaseComponent::providedClasses() +const QVector & UmlBaseComponent::providedClasses() { read_if_needed_(); return _provided; } -const Q3PtrVector & UmlBaseComponent::requiredClasses() +const QVector & UmlBaseComponent::requiredClasses() { read_if_needed_(); return _required; } -bool UmlBaseComponent::set_AssociatedClasses(const Q3PtrVector & realizing, const Q3PtrVector & provided, const Q3PtrVector & required) +bool UmlBaseComponent::set_AssociatedClasses(const QVector & realizing, const QVector & provided, const QVector & 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 #include "UmlItem.h" #include "anItemKind.h" -#include -#include + + #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 & realizingClasses(); + const QVector & realizingClasses(); // returns (in Java a copy of) the optional provided classes - const Q3PtrVector & providedClasses(); + const QVector & providedClasses(); // returns (in Java a copy of) the optional required classes - const Q3PtrVector & requiredClasses(); + const QVector & 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 & realizing, const Q3PtrVector & provided, const Q3PtrVector & required); + bool set_AssociatedClasses(const QVector & realizing, const QVector & provided, const QVector & 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 _realizing; + QVector _realizing; - Q3PtrVector _provided; + QVector _provided; - Q3PtrVector _required; + QVector _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 + 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 + 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 + 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 + // 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 + 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 + 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 -bool UmlBaseDiagram::saveIn(const Q3CString & s) const +#include +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 + // 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 + 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 + 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 + 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 + #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 +#include 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 + 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 + 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 +#include 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 + #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 + 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 + #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..9c7698eb6 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 & instances) +void UmlBaseFragment::read_covered_(QHash & instances) { unsigned n = UmlCom::read_unsigned(); unsigned rank; @@ -49,7 +49,7 @@ void UmlBaseFragment::read_covered_(Q3PtrDict & insta _covered.insert(rank, instances[(void *) UmlCom::read_unsigned()]); } -UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const Q3PtrVector & fragments) +UmlFragmentCompartment * UmlBaseFragment::get_container_(int x, int y, int w, int h, const QVector & 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 & fragments) +void UmlBaseFragment::compute_container_(QVector & 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 -#include -#include - +#include +#include +#include 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 & compartments() const { + const QVector & 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 & covered() const { + const QVector & covered() const { return _covered; } @@ -52,9 +49,9 @@ class UmlBaseFragment private: UmlFragmentCompartment * _container; - Q3PtrVector _compartments; + QVector _compartments; - Q3CString _name; + QByteArray _name; int _x; @@ -66,9 +63,9 @@ class UmlBaseFragment UmlDiagram * _refer; - Q3CString _arguments; + QByteArray _arguments; - Q3PtrVector _covered; + QVector _covered; // internal, don't call it void read_(); @@ -81,15 +78,15 @@ class UmlBaseFragment //internal, do NOT use it - void read_covered_(Q3PtrDict & instances); + void read_covered_(QHash & instances); // internal - static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const Q3PtrVector & fragments); + static UmlFragmentCompartment * get_container_(int x, int y, int w, int h, const QVector & fragments); private: // internal - static void compute_container_(Q3PtrVector & fragments); + static void compute_container_(QVector & 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 +#include 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 -#include + + class UmlFragment; class UmlBaseFragment; @@ -27,23 +27,23 @@ class UmlBaseFragmentCompartment } // the texts placed in the compartment - const Q3PtrVector & texts() const { + const QVector & texts() const { return _texts; } // return the fragments contained in the compartment, // may be none - const Q3PtrVector & contained() const { + const QVector & 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 _contained; + QVector _contained; int _rank; - Q3PtrVector _texts; + QVector _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 + 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 + 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..e4b2aca18 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 +#include -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 UmlBaseItem::children() +const QVector 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 UmlBaseItem::properties() +const QHash 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 UmlBaseItem::referencedBy() +const QVector UmlBaseItem::referencedBy() { UmlCom::send_cmd(_identifier, referencedByCmd); - Q3PtrVector result; + QVector result; UmlCom::read_item_list(result); return result; @@ -276,17 +276,17 @@ bool UmlBaseItem::isToolRunning(int id) return UmlCom::read_bool(); } -const Q3PtrVector UmlBaseItem::markedItems() +const QVector UmlBaseItem::markedItems() { UmlCom::send_cmd(miscGlobalCmd, allMarkedCmd); - Q3PtrVector result; + QVector result; UmlCom::read_item_list(result); return result; } -Q3PtrDict UmlBaseItem::_all(997); +QHash 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; + _children = new QVector; 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); @@ -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 #include "anItemKind.h" -#include -#include -#include -#include + + + + //#include "OnInstanceCmd.h" #include "aVisibility.h" #include "aDirection.h" +#include 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 children(); + const QVector 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 properties(); + const QHash 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 referencedBy(); + const QVector 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 markedItems(); + static const QVector 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 * _children; + QVector * _children; + + QHash _dict; + - Q3Dict _dict; + static QHash _all; - static Q3PtrDict _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 + 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 + 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..a68c1dd50 100644 --- a/genplugouts/GlobalChange/UmlBaseMessage.cpp +++ b/genplugouts/GlobalChange/UmlBaseMessage.cpp @@ -4,7 +4,7 @@ #include "UmlClassInstanceReference.h" #include "UmlOperation.h" -void UmlBaseMessage::read_(const Q3PtrDict & instances) +void UmlBaseMessage::read_(const QHash & instances) { _operation = (UmlOperation *) UmlBaseItem::read_(); 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 -#include - +#include +#include 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 & instances); + void read_(const QHash & 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 + 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 + 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 + 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 +#include -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 + 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 -#include +#include +#include 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 UmlBaseOperation::params() +const QList 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 UmlBaseOperation::exceptions() +const QList 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..4ef66ac4c 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 -#include +#include + #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 params(); + const QList 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 exceptions(); + const QList 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 @@ -141,7 +141,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 @@ -210,7 +210,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 @@ -271,7 +271,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 @@ -324,7 +324,7 @@ class UmlBaseOperation : public UmlClassMember // 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 // 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 _params; + QList _params; - Q3ValueList _exceptions; + QList _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 +#include 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..1c245557f 100644 --- a/genplugouts/GlobalChange/UmlBasePackage.h +++ b/genplugouts/GlobalChange/UmlBasePackage.h @@ -4,7 +4,7 @@ #include "UmlItem.h" #include "anItemKind.h" -#include + 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 @@ -170,7 +170,7 @@ class UmlBasePackage : public UmlItem //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 + #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 & UmlBaseParameterSet::pins() +const QVector & UmlBaseParameterSet::pins() { read_if_needed_(); return _pins; } -bool UmlBaseParameterSet::set_Pins(const Q3PtrVector & v) +bool UmlBaseParameterSet::set_Pins(const QVector & v) { - UmlCom::send_cmd(_identifier, replaceParameterCmd, (const Q3PtrVector &) v); + UmlCom::send_cmd(_identifier, replaceParameterCmd, (const QVector &) 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 &) _pins); + UmlCom::read_item_list((QVector &) _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 #include "UmlItem.h" #include "anItemKind.h" -#include -#include + + 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 & pins(); + const QVector & pins(); // set the pins - bool set_Pins(const Q3PtrVector & v); + bool set_Pins(const QVector & 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 _pins; + QVector _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 + #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 + 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 +#include 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 + #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 + 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..2f77977fc 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 +#include 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 instances; + QHash 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(); @@ -68,7 +68,7 @@ void UmlBaseSequenceDiagramDefinition::read_() 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 + class UmlClassInstanceReference; class UmlSequenceMessage; @@ -19,28 +19,28 @@ class UmlBaseSequenceDiagramDefinition { public: // return the instances present in the diagram - const Q3PtrVector & instances() const { + const QVector & instances() const { return _instances; } // return the messages present in the diagram, // ordonned following the sending time - const Q3PtrVector & messages() const { + const QVector & messages() const { return _messages; } // return the fragments present in the diagram - const Q3PtrVector & fragments() const { + const QVector & fragments() const { return _fragments; } private: - Q3PtrVector _instances; + QVector _instances; - Q3PtrVector _messages; + QVector _messages; - Q3PtrVector _fragments; + QVector _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 & instances, const Q3PtrVector & fragments) +void UmlBaseSequenceMessage::read_(const QHash &instances, const QVector &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 -#include -#include + + + #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 & instances, const Q3PtrVector & fragments); + void read_(const QHash &instances, const QVector &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 + 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 +#include 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 + #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 +#include 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 + 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 + 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 & subjects) +UmlSubject * UmlBaseSubject::get_container_(int x, int y, int w, int h, const QVector & 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 -#include -#include +#include 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 & subjects); + static UmlSubject * get_container_(int x, int y, int w, int h, const QVector & 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 + 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 +#include 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 + #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 +#include -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 -#include 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 +#include 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 + 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..536dd6a90 100644 --- a/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.cpp +++ b/genplugouts/GlobalChange/UmlBaseUseCaseAssociation.cpp @@ -4,7 +4,7 @@ #include "UmlUseCaseReference.h" #include "UmlClass.h" -void UmlBaseUseCaseAssociation::read_(const Q3PtrDict & useCases) +void UmlBaseUseCaseAssociation::read_(const QHash & useCases) { _use_case = (UmlUseCaseReference *) useCases[(void *) UmlCom::read_unsigned()]; _actor = (UmlClass *) UmlBaseItem::read_(); 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 -#include +#include +#include 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 & useCases); + void read_(const QHash &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 + 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..c805917dc 100644 --- a/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.cpp +++ b/genplugouts/GlobalChange/UmlBaseUseCaseDiagramDefinition.cpp @@ -4,7 +4,7 @@ void UmlBaseUseCaseDiagramDefinition::read_() { - Q3PtrDict ucrefs; + QHash 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); @@ -44,7 +44,7 @@ void UmlBaseUseCaseDiagramDefinition::read_() 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 + class UmlUseCaseReference; class UmlClass; @@ -23,41 +23,41 @@ class UmlBaseUseCaseDiagramDefinition { public: // return the use cases present in the diagram - const Q3PtrVector & useCases() const { + const QVector & useCases() const { return _use_cases; } // return the actors present in the diagram - const Q3PtrVector & actors() const { + const QVector & actors() const { return _actors; } // return the associations between actor and use case present in the diagram - const Q3PtrVector & associations() const { + const QVector & associations() const { return _rels; } // return the fragments present in the diagram - const Q3PtrVector & fragments() const { + const QVector & fragments() const { return _fragments; } // return the subjects present in the diagram - const Q3PtrVector & subjects() const { + const QVector & subjects() const { return _subjects; } private: - Q3PtrVector _use_cases; + QVector _use_cases; - Q3PtrVector _actors; + QVector _actors; - Q3PtrVector _rels; + QVector _rels; - Q3PtrVector _fragments; + QVector _fragments; - Q3PtrVector _subjects; + QVector _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 & fragments, const Q3PtrVector & subjects) +void UmlBaseUseCaseReference::read_(const QVector & fragments, const QVector & 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 -#include class UmlUseCase; class UmlFragmentCompartment; @@ -46,7 +46,7 @@ class UmlBaseUseCaseReference int _h; // internal, don't call it - void read_(const Q3PtrVector & fragments, const Q3PtrVector & subjects); + void read_(const QVector &fragments, const QVector &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 + 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 + 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 + -#include // 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..7b937a7c4 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 +#include +#include 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,7 +53,7 @@ void UmlClass::change(Context & ctx) } } - const Q3PtrVector ch = children(); + const QVector ch = children(); unsigned i; for (i = 0; i != ch.size(); i += 1) 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 + 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 + // 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 + 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 + // 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 + #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..53e320fdd 100644 --- a/genplugouts/GlobalChange/UmlClassView.cpp +++ b/genplugouts/GlobalChange/UmlClassView.cpp @@ -1,12 +1,13 @@ #include "UmlClassView.h" #include "Context.h" +#include void UmlClassView::change(Context & ctx) { if (ctx.onClass() || ctx.onOperation() || ctx.onAttribute() || ctx.onRelation()) { - const Q3PtrVector ch = children(); + const QVector ch = children(); unsigned i; for (i = 0; i != ch.size(); i += 1) 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 + 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 + // 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..42a8d32e2 100644 --- a/genplugouts/GlobalChange/UmlCom.cpp +++ b/genplugouts/GlobalChange/UmlCom.cpp @@ -1,9 +1,9 @@ #include "UmlCom.h" -#include +#include //Added by qt3to4: -#include +#include #include "UmlCom.h" #include "UmlItem.h" @@ -11,10 +11,11 @@ #include "UmlClass.h" #include "UmlSettings.h" #include "Tools/ApiCmd.h" +#include 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,7 +78,7 @@ void UmlCom::close() sock = 0; } -Q3SocketDevice * UmlCom::sock; +QTcpSocket * UmlCom::sock; char * UmlCom::buffer_in; @@ -142,7 +145,7 @@ void UmlCom::read_buffer(unsigned int len) 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 @@ -162,7 +165,7 @@ void UmlCom::read_buffer(unsigned int len) break; p += nread; - sock->waitForMore(100); + sock->waitForReadyRead(100); } #ifdef TRACE @@ -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 & l) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l) { #ifdef TRACE - cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l)\n"; + cout << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l)\n"; #endif write_char(onInstanceCmd); @@ -576,10 +579,10 @@ void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3) +void UmlCom::send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & l3) { #ifdef TRACE - cout << "UmlCom::send_cmd(id, " << cmd << ", const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3)\n"; + cout << "UmlCom::send_cmd(id, " << cmd << ", const QVector & l1, const QVector & l2, const QVector & l3)\n"; #endif write_char(onInstanceCmd); @@ -678,7 +681,7 @@ unsigned int UmlCom::read_unsigned() ((unsigned char *) p_buffer_in)[-1]; } -void UmlCom::read_item_list(Q3PtrVector & v) +void UmlCom::read_item_list(QVector & v) { unsigned n = read_unsigned(); @@ -689,10 +692,11 @@ void UmlCom::read_item_list(Q3PtrVector & 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 & +void UmlCom::fatal_error(const QByteArray & #ifdef DEBUG_BOUML msg #endif @@ -719,7 +723,7 @@ void UmlCom::flush() p_buffer_out = buffer_out; for (;;) { - int sent = sock->writeBlock(p_buffer_out, len); + int 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..04d12d5c9 100644 --- a/genplugouts/GlobalChange/UmlCom.h +++ b/genplugouts/GlobalChange/UmlCom.h @@ -2,21 +2,21 @@ #define _UMLCOM_H -#include +#include //#include "CmdFamily.h" //#include "OnInstanceCmd.h" #include "anItemKind.h" #include "aRelationKind.h" -#include -#include + + #include class UmlItem; class UmlTypeSpec; class UmlClass; -class Q3SocketDevice; +class QTcpSocket; class UmlItem; class UmlTypeSpec; class UmlClass; @@ -77,7 +77,7 @@ class UmlCom static void close(); private: - static Q3SocketDevice * sock; + static QTcpSocket * sock; static char * buffer_in; @@ -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 & l); - static void send_cmd(const void * id, OnInstanceCmd cmd, const Q3PtrVector & l1, const Q3PtrVector & l2, const Q3PtrVector & l3); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l); + static void send_cmd(const void * id, OnInstanceCmd cmd, const QVector & l1, const QVector & l2, const QVector & 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 & v); + static void read_item_list(QVector & 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 + // 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 + // 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 + // 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 + // 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..4f917ee5a 100644 --- a/genplugouts/GlobalChange/UmlDeploymentView.cpp +++ b/genplugouts/GlobalChange/UmlDeploymentView.cpp @@ -1,11 +1,12 @@ #include "UmlDeploymentView.h" #include "Context.h" +#include void UmlDeploymentView::change(Context & ctx) { if (ctx.onArtifact()) { - const Q3PtrVector ch = children(); + const QVector ch = children(); unsigned i; for (i = 0; i != ch.size(); i += 1) 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 + 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 + // 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 + 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 + 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 + 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 + 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 + // 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 + 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 + 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 + 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 + //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 + // 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 + // 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 + 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 +#include 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 + 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..8a6e4bafc 100644 --- a/genplugouts/GlobalChange/UmlPackage.cpp +++ b/genplugouts/GlobalChange/UmlPackage.cpp @@ -1,10 +1,10 @@ #include "UmlPackage.h" #include "Context.h" - +#include void UmlPackage::change(Context & ctx) { - const Q3PtrVector ch = children(); + const QVector ch = children(); unsigned i; for (i = 0; i != ch.size(); i += 1) 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 + 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 + #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 + 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 + #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 + 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 +#include 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 + 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 + // 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..e71c887cb 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 UmlSettings::artifactDescription() +#include +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,25 +146,25 @@ 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 UmlSettings::_map_builtins; +QHash UmlSettings::_map_builtins; UmlBuiltin * UmlSettings::_builtins; -Q3Dict UmlSettings::_map_relation_attribute_stereotypes; +QHash UmlSettings::_map_relation_attribute_stereotypes; UmlStereotype * UmlSettings::_relation_attribute_stereotypes; -Q3Dict UmlSettings::_map_class_stereotypes; +QHash UmlSettings::_map_class_stereotypes; UmlStereotype * UmlSettings::_class_stereotypes; @@ -178,7 +178,7 @@ void UmlSettings::read_() _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,7 +273,7 @@ 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; @@ -281,11 +281,11 @@ UmlBuiltin * UmlSettings::add_type(const Q3CString & s) 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,7 +310,7 @@ 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; @@ -318,11 +318,11 @@ UmlStereotype * UmlSettings::add_rel_attr_stereotype(const Q3CString & s) 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,7 +345,7 @@ 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; @@ -353,11 +353,11 @@ UmlStereotype * UmlSettings::add_class_stereotype(const Q3CString & s) 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 +#include -#include #include "aLanguage.h" -#include + 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 _map_builtins; + static QHash _map_builtins; static UmlBuiltin * _builtins; - static Q3Dict _map_relation_attribute_stereotypes; + static QHash _map_relation_attribute_stereotypes; static UmlStereotype * _relation_attribute_stereotypes; - static Q3Dict _map_class_stereotypes; + static QHash _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 + 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 + 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 +#include // 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 + 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 + // 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 + // 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 + // 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 + 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..80a6d02c4 --- /dev/null +++ b/genplugouts/GlobalChange/bbuttongroup.cpp @@ -0,0 +1,65 @@ +#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) +{ + + 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) +{ + +} + +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 +#include +#include +#include +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 +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 +#include +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..0a5059d3a --- /dev/null +++ b/genplugouts/GlobalChange/hhbox.cpp @@ -0,0 +1,29 @@ +#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); +} + +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 +#include +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 +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 +#include +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..0a4cd1997 --- /dev/null +++ b/genplugouts/GlobalChange/vvbox.cpp @@ -0,0 +1,25 @@ +#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); +} +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 +#include +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..e91dd66ef 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 +#include 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,9 +1220,9 @@ bool CppSettings::_is_generate_javadoc_comment; bool CppSettings::_is_inline_force_header_in_h; -Q3CString CppSettings::_visibility_indent; +QByteArray CppSettings::_visibility_indent; -Q3Dict CppSettings::_map_includes; +QHash CppSettings::_map_includes; void CppSettings::read_() { @@ -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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _map_includes; protected: diff --git a/genplugouts/HtmlDoc/FileWriter.cpp b/genplugouts/HtmlDoc/FileWriter.cpp index acd4faa16..cf815b179 100644 --- a/genplugouts/HtmlDoc/FileWriter.cpp +++ b/genplugouts/HtmlDoc/FileWriter.cpp @@ -1,12 +1,12 @@ #include "FileWriter.h" -#include +#include #include //Added by qt3to4: -#include +#include -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<writeRawBytes(s, strlen(s)); + //ts->writeRawBytes(s, strlen(s)); + *ts<writeRawBytes(&c, 1); + //ts->writeRawBytes(&c, 1); + *ts<writeRawBytes(s, s.length()); + //ts->writeRawBytes(s, s.length()); + *ts< -//Added by qt3to4: -#include +#include 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 + 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 6ab11a17f..dc82ca56c 100644 --- a/genplugouts/HtmlDoc/HtmlDoc.pro +++ b/genplugouts/HtmlDoc/HtmlDoc.pro @@ -10,7 +10,7 @@ CONFIG(Release, Debug|Release) { CONFIG += qt Release QMAKE_POST_LINK = " " } -DEFINES = WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON +DEFINES += WITHCPP WITHJAVA WITHIDL WITHPHP WITHPYTHON HEADERS = ./UmlBaseRelation.h \ ./UmlFormalParameter.h \ ./UmlCollaborationMessage.h \ @@ -413,11 +413,11 @@ 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 +QT += testlib DESTDIR = ../../bin Release { MOC_DIR = $${DESTDIR}/moc_release/ghtml @@ -432,3 +432,4 @@ UI_DIR = src/ui QMAKE_CXXFLAGS += -std=gnu++11 mac:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++ + diff --git a/genplugouts/HtmlDoc/IdlSettings.cpp b/genplugouts/HtmlDoc/IdlSettings.cpp index 526c000b3..5e078fbf2 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 +#include 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,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 IdlSettings::_map_includes; +QHash 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/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 + #include "UmlSettings.h" -#include + // 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 _map_includes; + static QHash _map_includes; protected: diff --git a/genplugouts/HtmlDoc/JavaSettings.cpp b/genplugouts/HtmlDoc/JavaSettings.cpp index 0eef9d723..36548750d 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 +#include 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,7 +705,7 @@ bool JavaSettings::_is_generate_javadoc_comment; bool JavaSettings::_is_force_package_gen; -Q3Dict JavaSettings::_map_imports; +QHash JavaSettings::_map_imports; void JavaSettings::read_() { @@ -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 + #include "aVisibility.h" #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _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 //Added by qt3to4: -#include +#include #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("Html generator release 2.20 (C++ version)
"); 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..0c1b69772 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 +#include #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; 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 + #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..1b1ddc3b9 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 +#include 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 PythonSettings::_map_imports; +QHash PythonSettings::_map_imports; void PythonSettings::read_() { @@ -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 + #include "UmlSettings.h" -#include + // 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 _map_imports; + static QHash _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 -#include 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 + 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 + 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 +#include -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..55c820a36 100644 --- a/genplugouts/HtmlDoc/UmlAccessVariableValueAction.h +++ b/genplugouts/HtmlDoc/UmlAccessVariableValueAction.h @@ -2,7 +2,7 @@ #define _UMLACCESSVARIABLEVALUEACTION_H -#include + #include "UmlBaseAccessVariableValueAction.h" class UmlAccessVariableValueAction : public UmlBaseAccessVariableValueAction @@ -10,12 +10,12 @@ 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); + 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 +#include -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("

"); @@ -44,7 +44,7 @@ void UmlActivity::html(Q3CString pfix, unsigned int rank, unsigned int level) else if (isSingleExecution()) fw.write("

Single execution

"); - 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 + #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 +#include 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("

"); - Q3CString scpp, sjava; + QByteArray scpp, sjava; s = preCondition(); scpp = cppPreCondition(); diff --git a/genplugouts/HtmlDoc/UmlActivityAction.h b/genplugouts/HtmlDoc/UmlActivityAction.h index b08586287..35dba85a6 100644 --- a/genplugouts/HtmlDoc/UmlActivityAction.h +++ b/genplugouts/HtmlDoc/UmlActivityAction.h @@ -3,7 +3,7 @@ #include "UmlBaseActivityAction.h" -#include + class UmlActivityAction : public UmlBaseActivityAction { @@ -15,7 +15,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 UmlSendObjectAction::sKind() +#include +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("

Value :