[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 652153 by mlaurent:

Now we use kde4


 M  +0 -9      kbabel/commonui/context.cpp  
 M  +0 -15     kbabel/kbabel/kbabelview.cpp  
 M  +0 -32     umbrello/umbrello/uml.cpp  
 M  +0 -14     umbrello/umbrello/uml.h  
 M  +0 -8      umbrello/umbrello/umlviewimageexporterall.cpp  


--- trunk/KDE/kdesdk/kbabel/commonui/context.cpp #652152:652153
@@ -137,21 +137,12 @@
     // Find the directory name of the PO file, if the PO file is local
     // ### TODO: find a way to allow remote files too
     QString poDir;
-#if KDE_IS_VERSION( 3, 5, 0 )
     const KUrl localUrl( KIO::NetAccess::mostLocalUrl( urlPoFile, m_parent ) );
     if ( localUrl.isLocalFile() )
     {
         const QFileInfo fi( localUrl.path() );
         poDir = fi.dir().absolutePath();
     }
-#else
-    if ( urlPoFile.isLocalFile() )
-    {
-        const QFileInfo fi( urlPoFile.path() );
-        poDir = fi.dirPath( true );
-    }
-#endif
-
 #if 0
     kDebug() << "CONTEXT VARIABLE START" << endl;
     kDebug() << "@CODEROOT@: " << _project->settings()->codeRoot() << endl;
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview.cpp #652152:652153
@@ -1656,19 +1656,11 @@
           }
           else
           {
-#if KDE_IS_VERSION ( 3, 4, 0 )
               msg += '\n';
               msg += i18n("Please edit the file again.");
               msg += "\n\n";
               msg += i18n("Output of \"msgfmt --statistics\":\n");
               KMessageBox::errorList( this, msg, outputLines );
-#else
-              msg += i18n("Output of \"msgfmt --statistics\":\n");
-              msg += output;
-              msg += "\n\n";
-              msg += i18n("Please edit the file again.");
-              KMessageBox::error( this, msg );
-#endif
               returnCode=false;
           }
           break;
@@ -1694,16 +1686,9 @@
             }
             else
             {
-#if KDE_IS_VERSION ( 3, 4, 0 )
                  msg += '\n';
                  msg += i18n("Please edit the file again.");
                  KMessageBox::errorList( this, msg, outputLines );
-#else
-                 msg += output;
-                 msg += "\n\n";
-                 msg += i18n("Please edit the file again.");
-                 KMessageBox::error( this, msg );
-#endif
                  returnCode=false;
             }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #652152:652153
@@ -963,39 +963,7 @@
     m_doc -> setModified( true );
 }
 
-//Remove these once we stop supporting KDE 3.1
-// #if !KDE_IS_VERSION(3,1,90)
 
-void UMLApp::slotViewToolBar() {
-    slotStatusMsg(i18n("Toggling toolbar..."));
-
-    ///////////////////////////////////////////////////////////////////
-    // turn Toolbar on or off
-
-    if(!viewToolBar->isChecked()) {
-        toolBar("mainToolBar")->hide();
-    } else {
-        toolBar("mainToolBar")->show();
-    }
-
-    slotStatusMsg(i18n("Ready."));
-}
-
-void UMLApp::slotViewStatusBar() {
-    slotStatusMsg(i18n("Toggle the statusbar..."));
-    ///////////////////////////////////////////////////////////////////
-    //turn Statusbar on or off
-    if(!viewStatusBar->isChecked()) {
-        statusBar()->hide();
-    } else {
-        statusBar()->show();
-    }
-
-    slotStatusMsg(i18n("Ready."));
-}
-// #endif
-
-
 void UMLApp::slotStatusMsg(const QString &text) {
     ///////////////////////////////////////////////////////////////////
     // change status message permanently
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.h #652152:652153
@@ -523,21 +523,7 @@
      */
     void slotEditPaste();
 
-    // #if !KDE_IS_VERSION(3,1,90)
     /**
-     * Toggles the toolbar.
-     * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1
-     */
-    void slotViewToolBar();
-
-    /**
-     * Toggles the statusbar.
-     * Deprecated. For compatibility with KDE 3.1, remove if we stop supporting KDE 3.1
-     */
-    void slotViewStatusBar();
-    // #endif
-
-    /**
      * Changes the statusbar contents for the standard label
      * permanently, used to indicate current actions.
      * @param text      The text that is displayed in the statusbar
--- trunk/KDE/kdesdk/umbrello/umbrello/umlviewimageexporterall.cpp #652152:652153
@@ -56,15 +56,7 @@
                                 UMLViewImageExporterModel::mimeTypeToImageType(m_dialog->m_imageType->currentFilter()),
                                 KUrl(m_dialog->m_kURL->url()), m_dialog->m_useFolders->isChecked());
     if (!errors.empty()) {
-#if KDE_IS_VERSION(3,4,0)
         KMessageBox::errorList(app, i18n("Some errors happened when exporting the images:"), errors);
-#else
-        QString errorsCaption;
-        for (QStringList::Iterator it = errors.begin(); it != errors.end(); ++it) {
-            errorsCaption += "\n" + *it;
-        }
-        KMessageBox::error(app, i18n("Some errors happened when exporting the images:") + errorsCaption);
-#endif
     }
     umlDoc->writeToStatusBar(i18n("Ready."));
 }