[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kmenuedit
From:       André Wöbbeking <Woebbeking () web ! de>
Date:       2006-01-27 14:21:39
Message-ID: 1138371699.929906.5661.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 502906 by woebbe:

KSharedPtr ctor is explicit now.

 M  +1 -1      khotkeys.cpp  
 M  +1 -1      menuinfo.cpp  
 M  +4 -4      treeview.cpp  
 M  +1 -1      treeview.h  


--- trunk/KDE/kdebase/kmenuedit/khotkeys.cpp #502905:502906
@@ -143,6 +143,6 @@
     if( !khotkeys_inited )
         init();
     if (!khotkeys_find_menu_entry_2)
-        return 0;
+        return KService::Ptr();
     return khotkeys_find_menu_entry_2(shortcut_P);
 }
--- trunk/KDE/kdebase/kmenuedit/menuinfo.cpp #502905:502906
@@ -274,7 +274,7 @@
       if (entryInfo->shortCut == cut)
          return entryInfo->service;
    }
-   return 0;
+   return KService::Ptr();
 }
 
 void MenuFolderInfo::setInUse(bool inUse)
--- trunk/KDE/kdebase/kmenuedit/treeview.cpp #502905:502906
@@ -754,7 +754,7 @@
      KDesktopFile *df = orig_df.copyTo(result);
      df->deleteEntry("Categories"); // Don't set any categories!
 
-     KService *s = new KService(df);
+     KService::Ptr s(new KService(df));
      s->setMenuId(menuId);
 
      MenuEntryInfo *entryInfo = new MenuEntryInfo(s, df);
@@ -873,7 +873,7 @@
          KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // \
Duplicate  //UNDO-ACTION: NEW_MENU_ID (menuId)
 
-         KService *s = new KService(df);
+         KService::Ptr s(new KService(df));
          s->setMenuId(menuId);
 
          entryInfo = new MenuEntryInfo(s, df);
@@ -1104,7 +1104,7 @@
    // m_menuFile->addEntry(folder, menuId);
    m_menuFile->pushAction(MenuFile::ADD_ENTRY, folder, menuId);
 
-   KService *s = new KService(df);
+   KService::Ptr s(new KService(df));
    s->setMenuId(menuId);
 
    MenuEntryInfo *entryInfo = new MenuEntryInfo(s, df);
@@ -1317,7 +1317,7 @@
          // Need to copy file and then add it
          KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // \
Duplicate  
-         KService *s = new KService(df);
+         KService::Ptr s(new KService(df));
          s->setMenuId(menuId);
          entryInfo = new MenuEntryInfo(s, df);
 
--- trunk/KDE/kdebase/kmenuedit/treeview.h #502905:502906
@@ -96,7 +96,7 @@
     TreeView(bool controlCenter, KActionCollection *ac, QWidget *parent=0, const \
char *name=0);  ~TreeView();
 
-    void readMenuFolderInfo(MenuFolderInfo *folderInfo=0, KServiceGroup::Ptr \
folder=0, const QString &prefix=QString()); +    void \
readMenuFolderInfo(MenuFolderInfo *folderInfo=0, KServiceGroup::Ptr \
folder=KServiceGroup::Ptr(), const QString &prefix=QString());  void setViewMode(bool \
showHidden);  bool save();
 


[prev in list] [next in list] [prev in thread] [next in thread]