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

[Oliver Kellogg]

SVN commit 467898 by okellogg:

compile a little more

 M  +1 -1      exportviewaction.cpp  
 M  +2 -2      kplayerslideraction.cpp  
 M  +2 -1      kplayerslideraction.h  
 M  +2 -2      main.cpp  
 M  +9 -8      uml.cpp  
 M  +3 -4      uml.h  
 M  +2 -0      umllistview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/exportviewaction.cpp #467897:467898
@@ -35,7 +35,7 @@
 
 ExportViewAction::ExportViewAction(QString extension, QObject *parent) :
     KAction(i18n("Export All Diagrams as Images"),
-            SmallIconSet("image"), 0, parent),
+            SmallIconSet("image"), KShortcut::null(), parent),
     m_extension(extension) {
     m_mimetype = "unknown";
     updateMimetype();
--- trunk/KDE/kdesdk/umbrello/umbrello/kplayerslideraction.cpp #467897:467898
@@ -70,8 +70,8 @@
 
 KPlayerPopupSliderAction::KPlayerPopupSliderAction (const QString& text,
         const QString& pix, const KShortcut& shortcut, const QObject* receiver,
-        const char* slot, QObject* parent, const char* name)
-        : KAction (text, pix, shortcut, parent, name)
+        const char* slot, KActionCollection* parent, const char* name)
+        : KAction (text, pix, shortcut, receiver, slot, parent, name)
 {
     m_frame = new KPlayerPopupFrame;
     m_frame -> setFrameStyle (Q3Frame::PopupPanel | Q3Frame::Raised);
--- trunk/KDE/kdesdk/umbrello/umbrello/kplayerslideraction.h #467897:467898
@@ -134,7 +134,8 @@
     /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction.
       */
     KPlayerPopupSliderAction (const QString& text, const QString& pix, const KShortcut& shortcut,
-                              const QObject* receiver, const char* slot, QObject* parent = 0, const char* name = 0);
+                              const QObject* receiver, const char* slot,
+                              KActionCollection* parent = 0, const char* name = 0);
     /** The KPlayerPopupSliderAction destructor. Deletes the KPlayerPopupFrame.
       */
     virtual ~KPlayerPopupSliderAction();
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #467897:467898
@@ -90,9 +90,9 @@
                 uml->newDocument();
             }
         }
-        QCStringList exportOpt = args->getOptionList("export");
+        QByteArrayList exportOpt = args->getOptionList("export");
         if (exportOpt.size() > 0) {
-        for (QCStringList::iterator itr = exportOpt.begin();
+        for (QByteArrayList::iterator itr = exportOpt.begin();
             itr != exportOpt.end(); ++itr) {
                 QString extension(*itr);
                 kdDebug() << "extension: " << extension << endl;
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #467897:467898
@@ -78,7 +78,7 @@
 #include "configurable.h"
 
 
-UMLApp::UMLApp(QWidget* , const char* name):KDockMainWindow(0, name) {
+UMLApp::UMLApp(QWidget* , const char* name) : K3DockMainWindow(0, name) {
     s_instance = this;
     m_pDocWindow = 0;
     m_config = kapp->config();
@@ -200,7 +200,7 @@
 
     deleteSelectedWidget = new KAction( i18n("Delete &Selected"),
                                         SmallIconSet("editdelete"),
-                                        KShortcut(Key_Delete), this,
+                                        KShortcut(Qt::Key_Delete), this,
                                         SLOT( slotDeleteSelectedWidget() ), actionCollection(),
                                         "delete_selected" );
 
@@ -423,22 +423,22 @@
         m_viewStack = new Q3WidgetStack(m_mainDock, "viewstack");
         m_mainDock->setWidget(m_viewStack);
     }
-    m_mainDock->setDockSite(KDockWidget::DockCorner);
-    m_mainDock->setEnableDocking(KDockWidget::DockNone);
+    m_mainDock->setDockSite(K3DockWidget::DockCorner);
+    m_mainDock->setEnableDocking(K3DockWidget::DockNone);
     setView(m_mainDock);
     setMainDockWidget(m_mainDock);
 
     m_listDock = createDockWidget( "Model", 0L, 0L, i18n("&Tree View") );
     m_listView = new UMLListView(m_listDock ,"LISTVIEW");
     m_listDock->setWidget(m_listView);
-    m_listDock->setDockSite(KDockWidget::DockCorner);
-    m_listDock->manualDock(m_mainDock, KDockWidget::DockLeft, 20);
+    m_listDock->setDockSite(K3DockWidget::DockCorner);
+    m_listDock->manualDock(m_mainDock, K3DockWidget::DockLeft, 20);
 
     m_documentationDock = createDockWidget( "Documentation", 0L, 0L, i18n("&Documentation") );
     m_pDocWindow = new DocWindow(m_doc, m_documentationDock, "DOCWINDOW");
     m_documentationDock->setWidget(m_pDocWindow);
-    m_documentationDock->setDockSite(KDockWidget::DockCorner);
-    m_documentationDock->manualDock(m_listDock, KDockWidget::DockBottom, 80);
+    m_documentationDock->setDockSite(K3DockWidget::DockCorner);
+    m_documentationDock->manualDock(m_listDock, K3DockWidget::DockBottom, 80);
 
     m_listView->setDocument(m_doc);
     m_doc->setupSignals();//make sure gets signal from list view
@@ -1081,6 +1081,7 @@
     m_config -> setGroup( "UI Options" );
     m_optionState.uiState.useFillColor = m_config -> readBoolEntry( "useFillColor", true );
     QColor defaultYellow = QColor( 255, 255, 192 );
+    QColor red ( Qt::red );
 
     m_optionState.uiState.fillColor = m_config -> readColorEntry( "fillColor", &defaultYellow );
     m_optionState.uiState.lineColor = m_config -> readColorEntry( "lineColor", &red );
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.h #467897:467898
@@ -55,7 +55,6 @@
 class KRecentFilesAction;
 class KStatusBarLabel;
 class KToggleAction;
-class KDockWidget;
 class KTabWidget;
 class KToolBarButton;
 class KMenu;
@@ -825,17 +824,17 @@
     /**
      * The widget which shows the diagrams.
      */
-    KDockWidget* m_mainDock;
+    K3DockWidget* m_mainDock;
 
     /**
      * Contains the UMLListView tree view.
      */
-    KDockWidget* m_listDock;
+    K3DockWidget* m_listDock;
 
     /**
      * Contains the documentation DocWindow widget.
      */
-    KDockWidget* m_documentationDock;
+    K3DockWidget* m_documentationDock;
 
     /**
      * Documentation window.
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #467897:467898
@@ -67,6 +67,7 @@
 #include "dialogs/umloperationdialog.h"
 #include "dialogs/umltemplatedialog.h"
 
+#ifdef WANT_LVTOOLTIP
 class LVToolTip : public QToolTip
 {
 public:
@@ -94,6 +95,7 @@
         tip(rect, text);
     }
 };
+#endif
 
 
 UMLListView::UMLListView(QWidget *parent, const char *name)