[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Christian Ehrlicher]

SVN commit 725061 by chehrlic:

qt3support-- (part 1/2)

 M  +1 -1      codedocument.cpp  
 M  +1 -1      codegenerators/cppcodegenerationform.cpp  
 M  +1 -1      codegenerators/csharpwriter.cpp  
 M  +1 -1      codegenerators/jswriter.cpp  
 M  +4 -4      codegenerators/pascalwriter.cpp  
 M  +2 -2      codegenerators/perlwriter.cpp  
 M  +1 -1      codegenerators/php5writer.cpp  
 M  +1 -1      codegenerators/phpwriter.cpp  
 M  +2 -2      codegenerators/pythonwriter.cpp  
 M  +1 -1      codegenerators/sqlwriter.cpp  
 M  +1 -1      codegenobjectwithtextblocks.cpp  
 M  +1 -1      docwindow.cpp  
 M  +1 -1      docwindow.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/codedocument.cpp #725060:725061
@@ -456,7 +456,7 @@
 
 void CodeDocument::removeChildTagFromMap ( const QString &tag )
 {
-    m_childTextBlockTagMap.erase(tag);
+    m_childTextBlockTagMap.remove(tag);
 }
 
 void CodeDocument::addChildTagToMap ( const QString &tag, TextBlock * tb)
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp #725060:725061
@@ -72,7 +72,7 @@
 
 void CPPCodeGenerationForm::browseClicked()
 {
-    QString button = sender()->name();
+    QString button = sender()->objectName();
     QString file = KFileDialog::getOpenFileName( KUrl(), "*.h", this, "Get Header File");
 
     if(file.isEmpty())
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/csharpwriter.cpp #725060:725061
@@ -170,7 +170,7 @@
     str = getHeadingFile(".cs");
     if (!str.isEmpty()) {
         str.replace(QRegExp("%filename%"),fileName);
-        str.replace(QRegExp("%filepath%"),filecs.name());
+        str.replace(QRegExp("%filepath%"),filecs.fileName());
         cs<<str<<m_endl;
     }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/jswriter.cpp #725060:725061
@@ -71,7 +71,7 @@
     if(!str.isEmpty())
     {
         str.replace(QRegExp("%filename%"),fileName);
-        str.replace(QRegExp("%filepath%"),filejs.name());
+        str.replace(QRegExp("%filepath%"),filejs.fileName());
         js << str << m_endl;
     }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/pascalwriter.cpp #725060:725061
@@ -212,7 +212,7 @@
                     QString typeName = at->getTypeName();
                     pas << getIndent() << name << " : " << typeName;
                     QString initialVal = at->getInitialValue();
-                    if (initialVal.latin1() && ! initialVal.isEmpty())
+                    if (!initialVal.isEmpty())
                         pas << " := " << initialVal;
                     pas << ";" << m_endl;
                 }
@@ -259,7 +259,7 @@
             //     continue;
             pas << getIndent() << cleanName(at->getName()) << " : "
                 << at->getTypeName();
-            if (at && at->getInitialValue().latin1() && ! at->getInitialValue().isEmpty())
+            if (at && !at->getInitialValue().isEmpty())
                 pas << " := " << at->getInitialValue();
             pas << ";" << m_endl;
         }
@@ -288,7 +288,7 @@
             //     continue;
             pas << getIndent() << cleanName(at->getName()) << " : "
                 << at->getTypeName();
-            if (at && at->getInitialValue().latin1() && ! at->getInitialValue().isEmpty())
+            if (at && !at->getInitialValue().isEmpty())
                 pas << " := " << at->getInitialValue();
             pas << ";" << m_endl;
         }
@@ -303,7 +303,7 @@
             //     continue;
             pas << getIndent() << cleanName(at->getName()) << " : "
                 << at->getTypeName();
-            if (at && at->getInitialValue().latin1() && ! at->getInitialValue().isEmpty())
+            if (at && !at->getInitialValue().isEmpty())
                 pas << " := " << at->getInitialValue();
             pas << ";" << m_endl;
         }
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/perlwriter.cpp #725060:725061
@@ -125,7 +125,7 @@
     QDir* existing = new QDir (curDir);
     QRegExp regEx("(.*)(::)");
     regEx.setMinimal(true);
-    while (regEx.search(fragment) > -1) {
+    while (regEx.indexIn(fragment) > -1) {
       newDir = regEx.cap(1);
       fragment.remove(0, (regEx.pos(2) + 2)); // get round strange minimal matching bug
       existing->setPath(curDir + '/' + newDir);
@@ -166,7 +166,7 @@
   str = getHeadingFile(".pm");   // what this mean?
   if(!str.isEmpty()) {
     str.replace(QRegExp("%filename%"),fileName);
-    str.replace(QRegExp("%filepath%"),fileperl.name());
+    str.replace(QRegExp("%filepath%"),fileperl.fileName());
     str.replace(QRegExp("%year%"),QDate::currentDate().toString("yyyy"));
     str.replace(QRegExp("%date%"),QDate::currentDate().toString());
     str.replace(QRegExp("%time%"),QTime::currentTime().toString());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/php5writer.cpp #725060:725061
@@ -3025,7 +3025,7 @@
     str = getHeadingFile(".php");
     if(!str.isEmpty()) {
         str.replace(QRegExp("%filename%"),fileName);
-        str.replace(QRegExp("%filepath%"),filephp.name());
+        str.replace(QRegExp("%filepath%"),filephp.fileName());
         php<<str<<m_endl;
     }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/phpwriter.cpp #725060:725061
@@ -3021,7 +3021,7 @@
     str = getHeadingFile(".php");
     if(!str.isEmpty()) {
         str.replace(QRegExp("%filename%"),fileName);
-        str.replace(QRegExp("%filepath%"),filephp.name());
+        str.replace(QRegExp("%filepath%"),filephp.fileName());
         php<<str<<m_endl;
     }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/pythonwriter.cpp #725060:725061
@@ -83,7 +83,7 @@
     str = getHeadingFile(".py");
     if(!str.isEmpty()) {
         str.replace(QRegExp("%filename%"), fileName);
-        str.replace(QRegExp("%filepath%"), fileh.name());
+        str.replace(QRegExp("%filepath%"), fileh.fileName());
         h<<str<<m_endl;
     }
 
@@ -116,7 +116,7 @@
             first = first.toUpper();
             headerName = headerName.replace(0, 1, first);
             str = headerName.replace(QChar('/'),QChar('.'));
-            if (includesList.findIndex(str) < 0)  // not yet imported
+            if (includesList.indexOf(str) < 0)  // not yet imported
                 h << "from " << str << " import *" << m_endl;
         }
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/sqlwriter.cpp #725060:725061
@@ -144,7 +144,7 @@
 
     QMap<UMLAssociation*,UMLAssociation*>::Iterator itor = constraintMap.begin();
     for (;itor != constraintMap.end();itor++) {
-        UMLAssociation* a = itor.data();
+        UMLAssociation* a = itor.value();
         sql << "ALTER TABLE "<< entityname
             << " ADD CONSTRAINT " << a->getName() << " FOREIGN KEY ("
             << a->getRoleName(Uml::B) << ") REFERENCES "
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenobjectwithtextblocks.cpp #725060:725061
@@ -121,7 +121,7 @@
     // if we get here.. it was in this object so remove from our map
     QString tag = remove_object->getTag();
     if(!tag.isEmpty())
-        m_textBlockTagMap.erase(tag);
+        m_textBlockTagMap.remove(tag);
 
     return true;
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/docwindow.cpp #725060:725061
@@ -28,7 +28,7 @@
 #include "umlwidget.h"
 
 
-DocWindow::DocWindow( UMLDoc * doc, QWidget *parent, const char *name ) : QWidget( parent, name ) {
+DocWindow::DocWindow( UMLDoc * doc, QWidget *parent ) : QWidget( parent ) {
     //setup visual display
 
     QVBoxLayout * docLayout = new QVBoxLayout( this );
--- trunk/KDE/kdesdk/umbrello/umbrello/docwindow.h #725060:725061
@@ -33,7 +33,7 @@
     /**
      * Constructor
      */
-    explicit DocWindow( UMLDoc * doc, QWidget *parent = 0, const char *name = 0 );
+    explicit DocWindow( UMLDoc * doc, QWidget *parent = 0 );
 
     /**
      * Deconstructor