[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators

[Oliver Kellogg]

SVN commit 465906 by okellogg:

move closer to trunk

 M  +1 -1      adawriter.cpp  
 M  +0 -1      adawriter.h  
 M  +1 -1      aswriter.cpp  
 M  +0 -3      aswriter.h  
 M  +0 -1      classifierinfo.h  
 M  +0 -2      cppwriter.h  
 M  +1 -1      idlwriter.cpp  
 M  +0 -1      idlwriter.h  
 M  +0 -1      javawriter.h  
 M  +1 -1      jswriter.cpp  
 M  +0 -2      jswriter.h  
 M  +1 -0      perlwriter.cpp  
 M  +0 -2      perlwriter.h  
 M  +1 -1      php5writer.cpp  
 M  +0 -2      php5writer.h  
 M  +1 -1      phpwriter.cpp  
 M  +0 -2      phpwriter.h  
 M  +0 -2      pythonwriter.h  
 M  +2 -0      simplecodegenerator.h  
 M  +0 -3      sqlwriter.h  
 M  +0 -3      xmlschemawriter.h  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/adawriter.cpp #465905:465906
@@ -22,8 +22,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <qfile.h>
-#include <qptrlist.h>
 #include <qregexp.h>
+#include <qtextstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/adawriter.h #465905:465906
@@ -20,7 +20,6 @@
 #define ADAWRITER_H
 
 #include "simplecodegenerator.h"
-#include <qtextstream.h>
 
 class UMLAssociation;
 class UMLOperation;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/aswriter.cpp #465905:465906
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <qregexp.h>
-#include <qstring.h>
+#include <qtextstream.h>
 
 ASWriter::ASWriter( UMLDoc *parent, const char *name )
         :SimpleCodeGenerator( parent, name) {
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/aswriter.h #465905:465906
@@ -21,9 +21,6 @@
 #include "simplecodegenerator.h"
 #include "../umloperationlist.h"
 
-#include <qptrlist.h>
-#include <qstringlist.h>
-
 /**
   * class ASWriter is a ActionScript code generator for UMLClassifier objects
   * Just call writeClass and feed it a UMLClassifier;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/classifierinfo.h #465905:465906
@@ -24,7 +24,6 @@
 #include "../umlassociationlist.h"
 #include "../umlattributelist.h"
 
-#include <qptrlist.h>
 #include <qstring.h>
 
 /**
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/cppwriter.h #465905:465906
@@ -20,14 +20,12 @@
 #ifndef CPPWRITER_H
 #define CPPWRITER_H
 
-#include <qstringlist.h>
 #include "simplecodegenerator.h"
 #include "../umloperationlist.h"
 #include "../umlattributelist.h"
 #include "../umlassociationlist.h"
 
 class QFile;
-class QTextStream;
 class ClassifierInfo;
 
 /**
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/idlwriter.cpp #465905:465906
@@ -14,8 +14,8 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <qfile.h>
-#include <qptrlist.h>
 #include <qregexp.h>
+#include <qtextstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/idlwriter.h #465905:465906
@@ -19,7 +19,6 @@
 #define IDLWRITER_H
 
 #include "simplecodegenerator.h"
-#include <qtextstream.h>
 
 class UMLAssociation;
 class UMLOperation;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/javawriter.h #465905:465906
@@ -25,7 +25,6 @@
 #include "../umlattributelist.h"
 #include "../umlassociationlist.h"
 
-class QTextStream;
 class UMLOperation;
 
 /**
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/jswriter.cpp #465905:465906
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 
 #include <qregexp.h>
-#include <qstring.h>
+#include <qtextstream.h>
 
 JSWriter::JSWriter( UMLDoc *parent, const char *name )
         :SimpleCodeGenerator( parent, name) {
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/jswriter.h #465905:465906
@@ -19,8 +19,6 @@
 #define JSWRITER_H
 
 #include "simplecodegenerator.h"
-
-#include <qstringlist.h>
 #include "../umloperationlist.h"
 
 /**
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/perlwriter.cpp #465905:465906
@@ -25,6 +25,7 @@
 #include <qstring.h>
 #include <qdir.h>
 #include <qdatetime.h>
+#include <qtextstream.h>
 
 PerlWriter::PerlWriter( UMLDoc * doc, const char *name )
         : SimpleCodeGenerator ( doc, name )
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/perlwriter.h #465905:465906
@@ -22,8 +22,6 @@
 #include "../umlattributelist.h"
 #include "../umloperationlist.h"
 
-#include <qstringlist.h>
-
 class UMLOperation;
 class UMLAttribute;
 class UMLClassifier;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/php5writer.cpp #465905:465906
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <qregexp.h>
-#include <qstring.h>
+#include <qtextstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/php5writer.h #465905:465906
@@ -24,8 +24,6 @@
 #include "../umlattributelist.h"
 #include "../umloperationlist.h"
 
-#include <qstringlist.h>
-
 /**
   * class Php5Writer is a PHP code generator for UMLClassifier objects
   * Just call writeClass and feed it a UMLClassifier;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/phpwriter.cpp #465905:465906
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <qregexp.h>
-#include <qstring.h>
+#include <qtextstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/phpwriter.h #465905:465906
@@ -22,8 +22,6 @@
 #include "../umlattributelist.h"
 #include "../umloperationlist.h"
 
-#include <qstringlist.h>
-
 /**
   * class PhpWriter is a PHP code generator for UMLClassifier objects
   * Just call writeClass and feed it a UMLClassifier;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/pythonwriter.h #465905:465906
@@ -20,8 +20,6 @@
 #include "simplecodegenerator.h"
 #include "../umloperationlist.h"
 
-#include <qstringlist.h>
-
 enum Access {PRIVATE, PUBLIC, PROTECTED};
 
 /**
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/simplecodegenerator.h #465905:465906
@@ -19,12 +19,14 @@
 #ifndef SIMPLECODEGENERATOR_H
 #define SIMPLECODEGENERATOR_H
 
+#include <qstringlist.h>
 #include <qstring.h>
 #include <qmap.h>
 
 #include "../codegenerator.h"
 #include "../umlnamespace.h"
 
+class QTextStream;
 class UMLDoc;
 class UMLAttribute;
 class CodeBlockWithComments;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/sqlwriter.h #465905:465906
@@ -21,9 +21,6 @@
 #include "simplecodegenerator.h"
 #include "../umlattributelist.h"
 
-#include <qstringlist.h>
-
-
 /**
   * class SQLWriter is a code generator for UMLClassifier objects.
   * Create an instance of this class, and feed it a UMLClassifier when
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/xmlschemawriter.h #465905:465906
@@ -25,9 +25,6 @@
 #include "../umlassociationlist.h"
 #include "simplecodegenerator.h"
 
-#include <qstringlist.h>
-
-
 /**
   * Class XMLSchemaWriter is a code generator for UMLClassifier objects.
   * Create an instance of this class, and feed it a UMLClassifier when