diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 07:40:52 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 07:40:52 +0000 |
commit | 5ce28931440fdff9ca7b9d389c15dd3c595db8b9 (patch) | |
tree | facdc2399882e5da19cdcd3511e5a111cb6c586d /umbrello | |
parent | 8ec20e584cd2045c01abb42d5c08fbcf2d77d8d8 (diff) | |
download | tdesdk-5ce28931440fdff9ca7b9d389c15dd3c595db8b9.tar.gz tdesdk-5ce28931440fdff9ca7b9d389c15dd3c595db8b9.zip |
Fix kdesdk Qt3 FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236291 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'umbrello')
-rw-r--r-- | umbrello/umbrello/codegenerators/codegenfactory.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/codegenerators/sqlwriter.cpp | 16 | ||||
-rw-r--r-- | umbrello/umbrello/codegenerators/sqlwriter.h | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/umbrello/umbrello/codegenerators/codegenfactory.cpp b/umbrello/umbrello/codegenerators/codegenfactory.cpp index 471d8f4c..00401653 100644 --- a/umbrello/umbrello/codegenerators/codegenfactory.cpp +++ b/umbrello/umbrello/codegenerators/codegenfactory.cpp @@ -161,7 +161,7 @@ CodeGenerator* createObject(Uml::Programming_Language pl) { obj = new RubyWriter(); break; case Uml::pl_SQL: - obj = new STQLWriter(); + obj = new SQLWriter(); break; case Uml::pl_Tcl: obj = new TclWriter(); diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp index d08ea1fe..214af4ad 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.cpp +++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp @@ -30,12 +30,12 @@ #include "../association.h" #include "../attribute.h" -STQLWriter::STQLWriter() { +SQLWriter::SQLWriter() { } -STQLWriter::~STQLWriter() {} +SQLWriter::~SQLWriter() {} -void STQLWriter::writeClass(UMLClassifier *c) { +void SQLWriter::writeClass(UMLClassifier *c) { if(!c) { kDebug()<<"Cannot write class of NULL concept!" << endl; @@ -113,7 +113,7 @@ void STQLWriter::writeClass(UMLClassifier *c) { } -void STQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { +void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { UMLAttributeList atpub, atprot, atpriv, atimp; atpub.setAutoDelete(false); atprot.setAutoDelete(false); @@ -171,7 +171,7 @@ void STQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { return; } -void STQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) { +void SQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) { TQString attrDoc = ""; UMLAttribute* at; @@ -211,11 +211,11 @@ void STQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeLi return; } -Uml::Programming_Language STQLWriter::getLanguage() { +Uml::Programming_Language SQLWriter::getLanguage() { return Uml::pl_SQL; } -TQStringList STQLWriter::defaultDatatypes() { +TQStringList SQLWriter::defaultDatatypes() { TQStringList l; l.append("varchar"); l.append("tinyint"); @@ -244,7 +244,7 @@ TQStringList STQLWriter::defaultDatatypes() { return l; } -const TQStringList STQLWriter::reservedKeywords() const { +const TQStringList SQLWriter::reservedKeywords() const { static TQStringList keywords; diff --git a/umbrello/umbrello/codegenerators/sqlwriter.h b/umbrello/umbrello/codegenerators/sqlwriter.h index e4df5e2b..1e16f18d 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.h +++ b/umbrello/umbrello/codegenerators/sqlwriter.h @@ -22,18 +22,18 @@ #include "../umlattributelist.h" /** - * class STQLWriter is a code generator for UMLClassifier objects. + * class SQLWriter is a code generator for UMLClassifier objects. * Create an instance of this class, and feed it a UMLClassifier when * calling writeClass and it will generate a sql source file for * that concept */ -class STQLWriter : public SimpleCodeGenerator { +class SQLWriter : public SimpleCodeGenerator { Q_OBJECT - TQ_OBJECT + TQ_OBJECT public: - STQLWriter(); - virtual ~STQLWriter(); + SQLWriter(); + virtual ~SQLWriter(); /** * call this method to generate sql code for a UMLClassifier |