/[KDE]/branches/KDE/4.5/kdegraphics/libs/libkipi/libkipi/pluginloader.cpp

Diff of /branches/KDE/4.5/kdegraphics/libs/libkipi/libkipi/pluginloader.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1194512, Tue Nov 9 08:25:57 2010 UTC revision 1194513, Tue Nov 9 08:30:14 2010 UTC
# Line 168  QString PluginLoader::Info::library() co Line 168  QString PluginLoader::Info::library() co
168  QIcon PluginLoader::Info::icon() const  QIcon PluginLoader::Info::icon() const
169  {  {
170      if(d->m_service->icon().isEmpty() && d->m_plugin)      if(d->m_service->icon().isEmpty() && d->m_plugin)
171          return QIcon(d->m_plugin->actions()[0]->icon());      {
172            if (d->m_plugin->actions()[0])
173                return d->m_plugin->actions()[0]->icon();
174            else
175                return QIcon();
176        }
177      else      else
178        {
179          return KIcon(d->m_service->icon());          return KIcon(d->m_service->icon());
180        }
181  }  }
182    
183  Plugin* PluginLoader::Info::plugin() const  Plugin* PluginLoader::Info::plugin() const
Legend:
Removed from v.1194512  
changed lines
  Added in v.1194513