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

[Laurent Montel]

SVN commit 587283 by mlaurent:

Compile/link
Deprecated--
Warning--


 M  +12 -12    codegenerationpolicy.cpp  
 M  +1 -1      configurable.cpp  
 M  +2 -2      main.cpp  
 M  +2 -4      uml.cpp  
 M  +2 -2      umldoc.cpp  
 M  +1 -1      umllistview.cpp  
 M  +1 -1      umllistviewitem.cpp  
 M  +1 -1      umlviewimageexporter.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerationpolicy.cpp #587282:587283
@@ -451,15 +451,15 @@
     // needlessly (we can just make one call at the end).
 
     config -> setGroup("Code Generation");
-    setAttributeAccessorScope((ScopePolicy)config->readNumEntry("defaultAttributeAccessorScope",defaultAttribAccessorScope()));
-    setAssociationFieldScope((ScopePolicy)config->readNumEntry("defaultAssocFieldScope",defaultAssocFieldScope()));
-    setCommentStyle((CommentStyle)config->readNumEntry("commentStyle",defaultCommentStyle()));
-    setAutoGenerateConstructors(config->readBoolEntry("autoGenEmptyConstructors",defaultAutoGenerateConstructors()));
-    setCodeVerboseDocumentComments( config->readBoolEntry("forceDoc",defaultVerboseDocumentComments()) );
-    setCodeVerboseSectionComments( config->readBoolEntry("forceSections",defaultVerboseSectionComments()) );
-    setLineEndingType( (NewLineType) config->readNumEntry("lineEndingType",defaultLineEndingType()) );
-    setIndentationType( (IndentationType) config->readNumEntry("indentationType",defaultIndentType()) );
-    setIndentationAmount( config->readNumEntry("indentationAmount",defaultIndentAmount()));
+    setAttributeAccessorScope((ScopePolicy)config->readEntry("defaultAttributeAccessorScope",(int)defaultAttribAccessorScope()));
+    setAssociationFieldScope((ScopePolicy)config->readEntry("defaultAssocFieldScope",(int)defaultAssocFieldScope()));
+    setCommentStyle((CommentStyle)config->readEntry("commentStyle",(int)defaultCommentStyle()));
+    setAutoGenerateConstructors(config->readEntry("autoGenEmptyConstructors",defaultAutoGenerateConstructors()));
+    setCodeVerboseDocumentComments( config->readEntry("forceDoc",defaultVerboseDocumentComments()) );
+    setCodeVerboseSectionComments( config->readEntry("forceSections",defaultVerboseSectionComments()) );
+    setLineEndingType( (NewLineType) config->readEntry("lineEndingType",(int)defaultLineEndingType()) );
+    setIndentationType( (IndentationType) config->readEntry("indentationType",(int)defaultIndentType()) );
+    setIndentationAmount( config->readEntry("indentationAmount",defaultIndentAmount()));
 
     QString path = config -> readPathEntry("outputDirectory");
     if(path.isEmpty())
@@ -473,9 +473,9 @@
     }
     setHeadingFileDir ( path );
 
-    setIncludeHeadings( config->readBoolEntry("includeHeadings",defaultIncludeHeadings()) );
-    setOverwritePolicy( (OverwritePolicy)config->readNumEntry("overwritePolicy",defaultOverwritePolicy()));
-    setModifyPolicy( (ModifyNamePolicy)config->readNumEntry("modnamePolicy",defaultModifyNamePolicy()));
+    setIncludeHeadings( config->readEntry("includeHeadings",defaultIncludeHeadings()) );
+    setOverwritePolicy( (OverwritePolicy)config->readEntry("overwritePolicy",(int)defaultOverwritePolicy()));
+    setModifyPolicy( (ModifyNamePolicy)config->readEntry("modnamePolicy",(int)defaultModifyNamePolicy()));
 
     blockSignals(false); // "as you were citizen"
 
--- trunk/KDE/kdesdk/umbrello/umbrello/configurable.cpp #587282:587283
@@ -45,7 +45,7 @@
 {
     bool ret = true;
 
-    QStringList names = config->readListEntry(key);
+    QStringList names = config->readEntry(key,QStringList());
     for(uint i = 0; i != names.size(); i++) {
         const QString &name = names[i];
 
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #587282:587283
@@ -150,7 +150,7 @@
     KStartupLogo* startLogo = 0L;
 
     cfg->setGroup( "General Options" );
-    bool showLogo = cfg->readBoolEntry( "logo", true );
+    bool showLogo = cfg->readEntry( "logo", true );
     if (showGUI && showLogo) {
         startLogo = new KStartupLogo(0);
         startLogo->setHideEnabled(true);
@@ -168,7 +168,7 @@
         UMLApp::app()->openDocumentFile( args->url( 0 ) );
     } else {
         cfg->setGroup( "General Options" );
-        bool last = cfg->readBoolEntry( "loadlast", false );
+        bool last = cfg->readEntry( "loadlast", false );
         QString file = cfg->readPathEntry( "lastFile" );
         if( last && !file.isEmpty() ) {
             UMLApp::app()->openDocumentFile( KUrl( file ) );
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #587282:587283
@@ -311,9 +311,7 @@
     
     viewShowGrid = new KToggleAction(i18n("S&how Grid"), actionCollection(), "view_show_grid");
     connect(viewShowGrid, SIGNAL( triggered( bool ) ), this, SLOT( slotCurrentViewToggleShowGrid() ));
-#if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3)
-    viewShowGrid->setCheckedState(i18n("&Hide Grid"));
-#endif
+    viewShowGrid->setCheckedState(KGuiItem(i18n("&Hide Grid")));
     deleteDiagram = new KAction(KIcon(SmallIconSet("editdelete")), i18n("&Delete"), 
                                 actionCollection(), "view_delete");
     connect(deleteDiagram, SIGNAL( triggered( bool ) ), this, SLOT( slotDeleteDiagram() ));
@@ -811,7 +809,7 @@
             QDir d = url.path( KUrl::RemoveTrailingSlash );
 
             if(QFile::exists(d.path())) {
-                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?", url.path()), i18n("Warning"), i18n("Overwrite"));
+                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?", url.path()), i18n("Warning"), KGuiItem(i18n("Overwrite")));
                 if(want_save == KMessageBox::Continue)
                     cont = false;
             } else
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #587282:587283
@@ -759,7 +759,7 @@
      */
     kError() << "UMLDoc::addUMLObject(" << object->getName()
        << "): no parent package set !" << endl;
-    kdBacktrace(25);
+    kBacktrace(25);
     return false;
 }
 
@@ -1119,7 +1119,7 @@
             if (p->findChildObject(name) == NULL
                     || ((o->getBaseType() == Uml::ot_Operation) && KMessageBox::warningYesNo( kapp -> mainWidget() ,
                             i18n( "The name you entered was not unique.\nIs this what you wanted?" ),
-                            i18n( "Name Not Unique"),i18n("Use Name"),i18n("Enter New Name")) == KMessageBox::Yes) ) {
+                            i18n( "Name Not Unique"),KGuiItem(i18n("Use Name")),KGuiItem(i18n("Enter New Name"))) == KMessageBox::Yes) ) {
                 o->setName(name);
                 setModified(true);
                 break;
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #587282:587283
@@ -1879,7 +1879,7 @@
             if( KMessageBox::warningYesNo(
                         kapp -> mainWidget(),
                         i18n( "The name you entered was not unique.\nIs this what you wanted?" ),
-                        i18n( "Name Not Unique" ), i18n("Use Name"), i18n("Enter New Name") ) == KMessageBox::No ) {
+                        i18n( "Name Not Unique" ), KGuiItem(i18n("Use Name")), KGuiItem(i18n("Enter New Name")) ) == KMessageBox::No ) {
                 return false;
             }
         } else {
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistviewitem.cpp #587282:587283
@@ -640,7 +640,7 @@
         itemElement.setAttribute( "label", m_Label );
     } else if (m_pObject->getID() == Uml::id_None) {
         if (m_Label.isEmpty()) {
-            kdDebug() << "UMLListViewItem::saveToXMI(): Skipping empty item"
+            kDebug() << "UMLListViewItem::saveToXMI(): Skipping empty item"
                 << endl;
             return;
         }
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexporter.cpp #587282:587283
@@ -64,7 +64,7 @@
                                 )) {
             int wantSave = KMessageBox::warningContinueCancel(0,
                                 i18n("The selected file %1 exists.\nDo you want to overwrite it?", m_imageURL.pathOrUrl()),
-                                i18n("File Already Exists"), i18n("&Overwrite"));
+                                i18n("File Already Exists"), KGuiItem(i18n("&Overwrite")));
             if (wantSave == KMessageBox::Continue) {
                 exportPrepared = true;
             }