[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello
Oliver Kellogg
okellogg at users.sourceforge.net
Sun Oct 2 17:12:46 UTC 2005
SVN commit 466107 by okellogg:
move closer to trunk
M +1 -0 boxwidget.cpp
A codedocumentlist.h [License: no copyright GPL (v2+)]
M +1 -1 codegenerationpolicy.cpp
M +5 -4 codegenerator.cpp
M +5 -4 codegenerator.h
M +5 -4 codegenerators/cppcodegenerator.cpp
M +2 -1 codegenerators/cppcodegenerator.h
M +1 -0 floatingtext.cpp
M +1 -0 objectwidget.cpp
M +1 -0 statewidget.cpp
M +1 -0 toolbarstate.cpp
M +1 -0 toolbarstateother.cpp
M +0 -1 umlcanvasobject.h
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/boxwidget.cpp #466106:466107
@@ -15,6 +15,7 @@
// own header
#include "boxwidget.h"
// qt/kde includes
+#include <qevent.h>
#include <kcursor.h>
#include <kdebug.h>
// app includes
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerationpolicy.cpp #466106:466107
@@ -21,7 +21,7 @@
#include <qstringlist.h>
#include <qregexp.h>
-#include <qdatastream.h>
+#include <qtextstream.h>
#include "dialogs/codegenerationpolicypage.h"
#include "codegenerationpolicy.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerator.cpp #466106:466107
@@ -22,6 +22,7 @@
#include <qdatetime.h>
#include <qregexp.h>
#include <qdir.h>
+#include <qtextstream.h>
// kde includes
#include <kdebug.h>
@@ -158,7 +159,7 @@
* @return QPtrList<CodeDocument *> list of CodeDocument objects held by
* m_codedocumentVector
*/
-QPtrList<CodeDocument> * CodeGenerator::getCodeDocumentList ( ) {
+CodeDocumentList * CodeGenerator::getCodeDocumentList ( ) {
return &m_codedocumentVector;
}
@@ -247,7 +248,7 @@
QDomElement docElement = doc.createElement( "codegenerator" );
docElement.setAttribute("language",langType);
- QPtrList<CodeDocument> * docList = getCodeDocumentList();
+ CodeDocumentList * docList = getCodeDocumentList();
for (CodeDocument * codeDoc = docList->first(); codeDoc; codeDoc= docList->next())
codeDoc->saveToXMI(doc, docElement);
@@ -345,7 +346,7 @@
}
void CodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) {
- QPtrList<CodeDocument> docs;
+ CodeDocumentList docs;
docs.setAutoDelete(false);
for (UMLClassifier *concept= concepts.first(); concept; concept= concepts.next())
@@ -359,7 +360,7 @@
}
// Main method. Will write out passed code documents to file as appropriate.
-void CodeGenerator::writeListedCodeDocsToFile ( QPtrList<CodeDocument> * docs ) {
+void CodeGenerator::writeListedCodeDocsToFile ( CodeDocumentList * docs ) {
// iterate thru all code documents
for (CodeDocument *doc = docs->first(); doc; doc = docs->next())
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerator.h #466106:466107
@@ -24,6 +24,7 @@
#include "codegenerationpolicy.h"
#include "umlclassifierlist.h"
+#include "codedocumentlist.h"
class UMLAttribute;
class UMLDoc;
@@ -138,10 +139,10 @@
/**
* Get the list of CodeDocument objects held by m_codedocumentVector
- * @return QPtrList<CodeDocument *> list of CodeDocument objects held by
+ * @return CodeDocumentList list of CodeDocument objects held by
* m_codedocumentVector
*/
- QPtrList<CodeDocument> * getCodeDocumentList ( );
+ CodeDocumentList * getCodeDocumentList ( );
/**
* Set the codeGeneratorPolicy for this generator.
@@ -380,7 +381,7 @@
/** the actual internal routine which writes code documents
*/
- void writeListedCodeDocsToFile(QPtrList<CodeDocument> * docs);
+ void writeListedCodeDocsToFile(CodeDocumentList * docs);
static const char * hierarchicalCodeBlockNodeName;
@@ -412,7 +413,7 @@
// this seems silly and overkill now. -b.t.
// QMap<CodeDocument*,QString> *m_fileMap;
- QPtrList<CodeDocument> m_codedocumentVector;
+ CodeDocumentList m_codedocumentVector;
CodeGenerationPolicy * m_codegeneratorpolicy;
int lastIDIndex;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/cppcodegenerator.cpp #466106:466107
@@ -28,6 +28,7 @@
#include "cppheadercodedocument.h"
#include "codegen_utils.h"
#include "codeviewerdialog.h"
+#include "../codedocumentlist.h"
const bool CPPCodeGenerator::DEFAULT_BUILD_MAKEFILE = false;
@@ -43,7 +44,7 @@
CPPCodeGenerator::~CPPCodeGenerator ( ) {
// destroy all separately owned codedocuments (e.g. header docs)
- QPtrList<CodeDocument> * list = &m_headercodedocumentVector;
+ CodeDocumentList * list = &m_headercodedocumentVector;
for (CodeDocument *doc = list->first(); doc; doc=list->next())
delete doc;
}
@@ -200,7 +201,7 @@
QDomElement docElement = doc.createElement( "codegenerator" );
docElement.setAttribute("language",langType);
- QPtrList<CodeDocument> * docList = getCodeDocumentList();
+ CodeDocumentList * docList = getCodeDocumentList();
for (CodeDocument * codeDoc = docList->first(); codeDoc; codeDoc= docList->next())
codeDoc->saveToXMI(doc, docElement);
@@ -216,7 +217,7 @@
*/
void CPPCodeGenerator::syncCodeToDocument ( ) {
- QPtrList<CodeDocument> * docList = getCodeDocumentList();
+ CodeDocumentList * docList = getCodeDocumentList();
for (CodeDocument * doc = docList->first(); doc; doc=docList->next())
doc->synchronize();
@@ -242,7 +243,7 @@
// overridden because we need to be able to generate code for
// both the header and source documents
void CPPCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) {
- QPtrList<CodeDocument> docs;
+ CodeDocumentList docs;
docs.setAutoDelete(false);
for (UMLClassifier *concept= concepts.first(); concept; concept= concepts.next())
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/cppcodegenerator.h #466106:466107
@@ -19,6 +19,7 @@
#define CPPCODEGENERATOR_H
#include <qstring.h>
+#include "../codedocumentlist.h"
#include "../codeviewerstate.h"
#include "../codegenerator.h"
#include "../umldoc.h"
@@ -170,7 +171,7 @@
bool m_createMakefile;
// a separate list for recording the header documents
- QPtrList<CodeDocument> m_headercodedocumentVector;
+ CodeDocumentList m_headercodedocumentVector;
void initAttributes ( ) ;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/floatingtext.cpp #466106:466107
@@ -16,6 +16,7 @@
// system includes
#include <qregexp.h>
#include <qpainter.h>
+#include <qevent.h>
#include <klocale.h>
#include <kdebug.h>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/objectwidget.cpp #466106:466107
@@ -16,6 +16,7 @@
// system includes
#include <qpainter.h>
#include <qvalidator.h>
+#include <qevent.h>
#include <klocale.h>
#include <kdebug.h>
// local includes
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/statewidget.cpp #466106:466107
@@ -14,6 +14,7 @@
#include "statewidget.h"
+#include <qevent.h>
#include <klocale.h>
#include <kdebug.h>
#include "inputdialog.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/toolbarstate.cpp #466106:466107
@@ -12,6 +12,7 @@
* *
***************************************************************************/
#include <qwmatrix.h> // need for inverseWorldMatrix.map
+#include <qevent.h>
#include "toolbarstate.h"
#include "umlview.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/toolbarstateother.cpp #466106:466107
@@ -18,6 +18,7 @@
// qt/kde includes
#include <qstring.h>
#include <qevent.h>
+#include <qevent.h>
#include <klocale.h>
#include <kdebug.h>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlcanvasobject.h #466106:466107
@@ -14,7 +14,6 @@
#include "umlobjectlist.h"
#include "umlclassifierlist.h"
#include "umlassociationlist.h"
-#include <qptrlist.h>
class IDChangeLog;
More information about the umbrello-devel
mailing list