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

[Oliver Kellogg]

SVN commit 488619 by okellogg:

compile

 M  +1 -1      dialogs/classgenpage.cpp  
 M  +1 -1      dialogs/codeeditor.cpp  
 M  +1 -1      dialogs/codeviewerdialog.cpp  
 M  +3 -3      import_utils.cpp  
 M  +1 -1      textblock.cpp  
 M  +1 -1      umlnamespace.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classgenpage.cpp #488618:488619
@@ -20,7 +20,7 @@
 #include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <q3multilineedit.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp #488618:488619
@@ -246,7 +246,7 @@
 
     // now do 'paragraph' background highlighting
     //        int endLine = paragraphs()-2;
-    int endLine = text.contains(QRegExp("\n")) + startLine -1;
+    int endLine = text.indexOf(QRegExp("\n")) + startLine -1;
     if(m_isHighlighted)
         for(int para=startLine;para<=endLine;para++)
             setParagraphBackgroundColor(para,bgcolor);
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codeviewerdialog.cpp #488618:488619
@@ -62,7 +62,7 @@
     m_highlightCheckBox->setChecked( getState().blocksAreHighlighted );
     m_showHiddenCodeCB->setChecked ( getState().showHiddenBlocks );
 
-    CodeViewerDialogBaseLayout->setMargin(margin);
+    CodeViewerDialogBase::gridLayout->setMargin(margin);
 
     resize( QSize(width, height).expandedTo(minimumSizeHint()) );
 
--- trunk/KDE/kdesdk/umbrello/umbrello/import_utils.cpp #488618:488619
@@ -114,11 +114,11 @@
     bNewUMLObjectWasCreated = false;
     if (o == NULL) {
         // Strip possible adornments and look again.
-        int isConst = name.contains(QRegExp("^const "));
+        const bool isConst = name.contains(QRegExp("^const "));
         name.remove(QRegExp("^const\\s+"));
         QString typeName(name);
-        int isPointer = typeName.contains('*');
-        int isRef = typeName.contains('&');
+        const bool isPointer = typeName.contains('*');
+        const bool isRef = typeName.contains('&');
         typeName.remove(QRegExp("[^\\w: ].*$"));
         UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg);
         if (origType == NULL) {
--- trunk/KDE/kdesdk/umbrello/umbrello/textblock.cpp #488618:488619
@@ -197,7 +197,7 @@
     QString output = "";
     QString text = work;
     QString endLine = getNewLineEndingChars();
-    int matches = text.contains(QRegExp(breakStr));
+    int matches = text.indexOf(QRegExp(breakStr));
     if(matches)
     {
         // check that last part of string matches, if not, then
--- trunk/KDE/kdesdk/umbrello/umbrello/umlnamespace.cpp #488618:488619
@@ -19,7 +19,7 @@
 
 bool tagEq (QString tag, QString pattern) {
     tag.remove( QRegExp("^\\w+:") );  // remove leading "UML:" or other
-    int patSections = pattern.contains( '.' ) + 1;
+    int patSections = pattern.indexOf( '.' ) + 1;
     QString tagEnd = tag.section( '.', -patSections );
     return (tagEnd.lower() == pattern.lower());
 }