[Uml-devel] kdesdk/umbrello/umbrello

[Benjamin Meyer]

CVS commit by bmeyer: 

KDE_NO_COMPAT compile fixes.


  M +14 -14    uml.cpp   1.140
  M +1 -1      umldoc.cpp   1.240


--- kdesdk/umbrello/umbrello/uml.cpp  #1.139:1.140
@@ -189,20 +189,20 @@ void UMLApp::initActions() {
                                     this,SLOT(slotImportClasses()), actionCollection(),"import_class");
 
-        fileNew->setStatusText(i18n("Creates a new document"));
-        fileOpen->setStatusText(i18n("Opens an existing document"));
-        fileOpenRecent->setStatusText(i18n("Opens a recently used file"));
-        fileSave->setStatusText(i18n("Saves the document"));
-        fileSaveAs->setStatusText(i18n("Saves the document as..."));
-        fileClose->setStatusText(i18n("Closes the document"));
-        filePrint ->setStatusText(i18n("Prints out the document"));
-        fileQuit->setStatusText(i18n("Quits the application"));
-        editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard"));
-        editCopy->setStatusText(i18n("Copies the selected section to the clipboard"));
-        editPaste->setStatusText(i18n("Pastes the contents of the clipboard"));
+        fileNew->setToolTip(i18n("Creates a new document"));
+        fileOpen->setToolTip(i18n("Opens an existing document"));
+        fileOpenRecent->setToolTip(i18n("Opens a recently used file"));
+        fileSave->setToolTip(i18n("Saves the document"));
+        fileSaveAs->setToolTip(i18n("Saves the document as..."));
+        fileClose->setToolTip(i18n("Closes the document"));
+        filePrint ->setToolTip(i18n("Prints out the document"));
+        fileQuit->setToolTip(i18n("Quits the application"));
+        editCut->setToolTip(i18n("Cuts the selected section and puts it to the clipboard"));
+        editCopy->setToolTip(i18n("Copies the selected section to the clipboard"));
+        editPaste->setToolTip(i18n("Pastes the contents of the clipboard"));
 #if !KDE_IS_VERSION(3,1,90)
-        viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
-        viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
+        viewToolBar->setToolTip(i18n("Enables/disables the toolbar"));
+        viewStatusBar->setToolTip(i18n("Enables/disables the statusbar"));
 #endif
-        preferences->setStatusText( i18n( "Set the default program preferences") );
+        preferences->setToolTip( i18n( "Set the default program preferences") );
 
         deleteSelectedWidget = new KAction( i18n("Delete &Selected"),

--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.239:1.240
@@ -598,5 +598,5 @@ bool UMLDoc::saveDocument(const KURL& ur
 
                 // now add this file to the archive, but without the extension
-                QString tmpQString = url.filename();
+                QString tmpQString = url.fileName();
                 if (fileFormat == "tgz")
                 {