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

[Oliver Kellogg]

SVN commit 522330 by okellogg:

compile a little more

 M  +3 -2      aligntoolbar.cpp  
 M  +3 -1      aligntoolbar.h  
 M  +1 -1      floatingtext.cpp  
 M  +0 -1      objectwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/aligntoolbar.cpp #522329:522330
@@ -19,12 +19,13 @@
 #include "umlwidget.h"
 #include "umlwidgetlist.h"
 
+#include <QMainWindow>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
-AlignToolBar::AlignToolBar(Q3MainWindow* parentWindow, const char* name)
-        : KToolBar(parentWindow,Qt::DockRight,false,name)
+AlignToolBar::AlignToolBar(QMainWindow* parentWindow, const char*)
+        : KToolBar(parentWindow,Qt::DockRight,false)
 {
     // load images for the buttons
     loadPixmaps();
--- trunk/KDE/kdesdk/umbrello/umbrello/aligntoolbar.h #522329:522330
@@ -15,10 +15,12 @@
 #ifndef ALIGNTOOLBAR_H
 #define ALIGNTOOLBAR_H
 
+#include <QPixmap>
 #include <ktoolbar.h>
 #include "umlnamespace.h"
 #include "umlwidgetlist.h"
 
+class QMainWindow;
 
 /**
  * This toolbar provides tools for alignment. Widgets can only be aligned, when
@@ -38,7 +40,7 @@
      * @param parentWindow      The parent of the toolbar.
      * @param name              The name of the toolbar.
      */
-    AlignToolBar(Q3MainWindow* parentWindow, const char* name);
+    AlignToolBar(QMainWindow* parentWindow, const char* name);
 
     /**
      * Standard deconstructor.
--- trunk/KDE/kdesdk/umbrello/umbrello/floatingtext.cpp #522329:522330
@@ -171,7 +171,7 @@
     }
     bool ok = false;
     QString newText = KInputDialog::getText(i18n("Rename"), t, getText(), &ok,
-                                            m_pView, NULL, &v);
+                                            m_pView, &v);
     if (!ok || newText == getText())
         return;
     if (m_pLink && !isTextValid(newText)) {
--- trunk/KDE/kdesdk/umbrello/umbrello/objectwidget.cpp #522329:522330
@@ -87,7 +87,6 @@
                     m_InstanceName,
                     &ok,
                     m_pView,
-                    "renameobject",
                     validator);
             if (ok) {
                 m_InstanceName = name;