Date: Friday, February 18, 2011 @ 02:52:43 Author: andrea Revision: 110248
cleanup Deleted: k3b/trunk/fix-crash-with-qt-4.7.0.patch -------------------------------+ fix-crash-with-qt-4.7.0.patch | 37 ------------------------------------- 1 file changed, 37 deletions(-) Deleted: fix-crash-with-qt-4.7.0.patch =================================================================== --- fix-crash-with-qt-4.7.0.patch 2011-02-18 07:47:11 UTC (rev 110247) +++ fix-crash-with-qt-4.7.0.patch 2011-02-18 07:52:43 UTC (rev 110248) @@ -1,37 +0,0 @@ -Index: src/option/k3bpluginoptiontab.cpp -=================================================================== ---- src/option/k3bpluginoptiontab.cpp (revision 1168967) -+++ src/option/k3bpluginoptiontab.cpp (working copy) -@@ -43,12 +43,28 @@ - layout->addWidget( label ); - layout->addWidget( pluginSelector ); - -+ // find all categories -+ QHash<QString, QString> categoryNames; -+ - foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { -- kDebug() << "Adding plugin" << plugin->pluginInfo().name(); -- pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(), -+ categoryNames[ plugin->category() ] = plugin->categoryName(); -+ } -+ -+ // add all plugins in each category -+ foreach( const QString &category, categoryNames.keys() ) { -+ QList<KPluginInfo> plugins; -+ -+ foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { -+ if ( plugin->category() == category ) { -+ plugins << plugin->pluginInfo(); -+ kDebug() << "Adding plugin" << plugin->pluginInfo().name(); -+ } -+ } -+ pluginSelector->addPlugins( plugins, - KPluginSelector::ReadConfigFile, -- plugin->categoryName(), -- plugin->category() ); -+ categoryNames[ category ], -+ category -+ ); - } - } -