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

[Oliver Kellogg]

SVN commit 465453 by okellogg:

merge back commit 465452 from branches/KDE/3.5

 M  +1 -1      adaimport.cpp  
 M  +1 -1      classifierwidget.cpp  
 M  +1 -0      codedocument.cpp  
 M  +1 -1      codegenobjectwithtextblocks.h  
 M  +0 -1      messagewidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/adaimport.cpp #465452:465453
@@ -64,7 +64,7 @@
                 m_source.append(":=");
                 i++;
             } else {
-                m_source.append(c);
+                m_source.append(QString(c));
             }
         }
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/classifierwidget.cpp #465452:465453
@@ -572,7 +572,7 @@
     if ( tlist.count() > 0 ) {
         UMLWidget::setPen(p);
         QPen pen = p.pen();
-        pen.setStyle(DotLine);
+        pen.setStyle(Qt::DotLine);
         p.setPen(pen);
         p.drawRect( offsetX + width() - templatesBoxSize.width(), offsetY,
                     templatesBoxSize.width(), templatesBoxSize.height() );
--- trunk/KDE/kdesdk/umbrello/umbrello/codedocument.cpp #465452:465453
@@ -15,6 +15,7 @@
 
 #include <kdebug.h>
 #include <qregexp.h>
+#include <qdatetime.h>
 //Added by qt3to4:
 #include <Q3PtrList>
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenobjectwithtextblocks.h #465452:465453
@@ -17,7 +17,7 @@
 #ifndef CODEGENOBJECTWITHTEXTBLOCKS_H
 #define CODEGENOBJECTWITHTEXTBLOCKS_H
 
-
+#include <qmap.h>
 #include "codeaccessormethod.h"
 //Added by qt3to4:
 #include <Q3PtrList>
--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.cpp #465452:465453
@@ -20,7 +20,6 @@
 #include <QMoveEvent>
 #include <QResizeEvent>
 //kde includes
-#include <klineeditdlg.h>
 #include <kdebug.h>
 #include <kcursor.h>
 //app includes