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

[Laurent Montel]

SVN commit 554108 by mlaurent:

port++ (not finish yet :( )


 M  +3 -3      main.cpp  
 M  +1 -1      pluginloader.h  
 M  +3 -3      uml.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #554107:554108
@@ -80,7 +80,7 @@
  * @param args The command line arguments given.
  * @param exportOpt A list containing all the "export" arguments given.
  */
-void exportAllViews(KCmdLineArgs *args, const QCStringList &exportOpt);
+void exportAllViews(KCmdLineArgs *args, const QByteArrayList &exportOpt);
 
 int main(int argc, char *argv[]) {
     KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"),
@@ -162,7 +162,7 @@
         bool last = cfg->readBoolEntry( "loadlast", false );
         QString file = cfg->readPathEntry( "lastFile" );
         if( last && !file.isEmpty() ) {
-            UMLApp::app()->openDocumentFile( KURL( file ) );
+            UMLApp::app()->openDocumentFile( KUrl( file ) );
         } else {
             UMLApp::app()->newDocument();
         }
@@ -186,7 +186,7 @@
 
     bool useFolders = args->isSet("use-folders");
 
-    kDebug() << "directory: " << directory.prettyURL() << endl;
+    kDebug() << "directory: " << directory.prettyUrl() << endl;
 
     // the event is posted so when the QT loop begins it's processed. UMLApp process this event executing
     // the method it provides for exporting the views. Once all the views were exported, a quit event
--- trunk/KDE/kdesdk/umbrello/umbrello/pluginloader.h #554107:554108
@@ -20,7 +20,7 @@
 
 #ifndef UMBRELLO_PLUGINLOADER_H
 #define UMBRELLO_PLUGINLOADER_H
-
+#include <QMap>
 // Qt includes
 
 // forward declarations
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #554107:554108
@@ -488,7 +488,7 @@
     m_config->writeEntry( "logo", m_optionState.generalState.logo );
     m_config->writeEntry( "loadlast", m_optionState.generalState.loadlast );
 
-    m_config->writeEntry( "diagram", m_optionState.generalState.diagram );
+    m_config->writeEntry( "diagram", (int)m_optionState.generalState.diagram );
     if( m_doc->URL().fileName() == i18n( "Untitled" ) ) {
         m_config -> writeEntry( "lastFile", "" );
     } else {
@@ -516,8 +516,8 @@
     m_config->writeEntry( "showAttSig", m_optionState.classState.showAttSig );
     m_config->writeEntry( "ShowOpSig", m_optionState.classState.showOpSig );
     m_config->writeEntry( "showPackage", m_optionState.classState.showPackage );
-    m_config->writeEntry( "defaultAttributeScope", m_optionState.classState.defaultAttributeScope);
-    m_config->writeEntry( "defaultOperationScope", m_optionState.classState.defaultOperationScope);
+    m_config->writeEntry( "defaultAttributeScope", (int)m_optionState.classState.defaultAttributeScope);
+    m_config->writeEntry( "defaultOperationScope", (int)m_optionState.classState.defaultOperationScope);
 
     m_config -> setGroup( "Code Viewer Options" );
     m_config->writeEntry( "height", m_optionState.codeViewerState.height );