kstandardirs updates

svn path=/trunk/KDE/kdebase/libkonq/; revision=632887
This commit is contained in:
Aaron J. Seigo 2007-02-12 16:17:46 +00:00
parent dfc7a2814c
commit 02bcd258bf
6 changed files with 8 additions and 7 deletions

View file

@ -88,7 +88,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
{
if (args->isSet("profiles"))
{
QStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", false, true);
QStringList profiles = KGlobal::dirs()->findAllResources("data", "konqueror/profiles/*", KStandardDirs::NoDuplicates);
profiles.sort();
for(QStringList::ConstIterator it = profiles.begin();
it != profiles.end(); ++it)

View file

@ -42,7 +42,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
{
KonqProfileMap mapProfiles;
QStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", false, true );
QStringList profiles = KGlobal::dirs()->findAllResources( "data", "konqueror/profiles/*", KStandardDirs::NoDuplicates );
QStringList::ConstIterator pIt = profiles.begin();
QStringList::ConstIterator pEnd = profiles.end();
for (; pIt != pEnd; ++pIt )

View file

@ -65,7 +65,9 @@ void addBackEnd::aboutToShowAddMenu()
if (!menu)
return;
KStandardDirs *dirs = KGlobal::dirs();
QStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",true,true);
QStringList list = dirs->findAllResources("data","konqsidebartng/add/*.desktop",
KStandardDirs::Recursive |
KStandardDirs::NoDuplicates);
menu->clear();
int i = 0;

View file

@ -95,7 +95,7 @@ void KonqSidebarTree::loadModuleFactories()
pluginFactories.clear();
pluginInfo.clear();
KStandardDirs *dirs=KGlobal::dirs();
QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",KStandardDirs::NoDuplicates);
for (QStringList::ConstIterator it=list.begin();it!=list.end();++it)

View file

@ -126,7 +126,7 @@ extern "C"
KDE_EXPORT bool add_konqsidebar_tree(QString* fn, QString*, QMap<QString,QString> *map)
{
KStandardDirs *dirs=KGlobal::dirs();
QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true);
QStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",KStandardDirs::NoDuplicates);
QStringList names;
for (QStringList::ConstIterator it=list.begin();it!=list.end();++it)
{

View file

@ -659,8 +659,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
// findAllResources() also removes duplicates
const QStringList entries = KGlobal::dirs()->findAllResources( "data",
"konqueror/servicemenus/*.desktop",
false /* recursive */,
true /* unique */ );
KStandardDirs::NoDuplicates );
QStringList::ConstIterator eIt = entries.begin();
const QStringList::ConstIterator eEnd = entries.end();
for (; eIt != eEnd; ++eIt )