Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 9bb938de93248ca5cc71ecf424cefd6c > files > 47

kdebase-3.5.4-21.el5_5.1.src.rpm

Index: kate/app/katemainwindow.cpp
===================================================================
--- kate/app/katemainwindow.cpp	(Revision 583755)
+++ kate/app/katemainwindow.cpp	(Revision 583756)
@@ -615,18 +615,18 @@
 {
   KURL::List list;
   list.append( m_viewManager->activeView()->getDoc()->url() );
-  QString* appname = new QString( documentOpenWith->popupMenu()->text(idx) );
+  QString appname = documentOpenWith->popupMenu()->text(idx);
 
-  *appname = appname->remove('&'); //Remove a possible accelerator ... otherwise the application might not get found.
-  if ( appname->compare(i18n("Other...")) == 0 ) {
+  appname = appname.remove('&'); //Remove a possible accelerator ... otherwise the application might not get found.
+  if ( appname.compare(i18n("Other...")) == 0 ) {
     // display "open with" dialog
-    KOpenWithDlg* dlg = new KOpenWithDlg(list);
-    if (dlg->exec())
-      KRun::run(*dlg->service(), list);
+    KOpenWithDlg dlg(list);
+    if (dlg.exec())
+      KRun::run(*dlg.service(), list);
     return;
   }
 
-  QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg( appname->latin1() );
+  QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() );
   KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
   KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry);
 
@@ -635,9 +635,7 @@
     KRun::run(*app, list);
   }
   else
-    KMessageBox::error(this, i18n("Application '%1' not found!").arg(appname->latin1()), i18n("Application Not Found!"));
-
-
+    KMessageBox::error(this, i18n("Application '%1' not found!").arg(appname.latin1()), i18n("Application Not Found!"));
 }
 
 void KateMainWindow::pluginHelp()
Index: kdesktop/bgmanager.cc
===================================================================
--- kdesktop/bgmanager.cc	(Revision 587602)
+++ kdesktop/bgmanager.cc	(Revision 587603)
@@ -134,8 +134,8 @@
 
     for (unsigned i=0; i<m_Cache.size(); i++)
     {
-	if (m_Cache[i]->pixmap)
-	    delete m_Cache[i]->pixmap;
+        delete m_Cache[i]->pixmap;
+        delete m_Cache[i];
     }
 }