kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up the code as per dfaure's comment

Browse source 
svn path=/trunk/kdebase/libkonq/; revision=366047
This commit is contained in:
Aaron J. Seigo 2004-11-25 07:02:45 +00:00
parent 7fde4e8b3d
commit 46bdc09390
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/konq/konq_popupmenu.cc
View file

@ -671,24 +671,17 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
// we could cram the following three if statements into
// one gigantic boolean statement but that would be a
// hororr show for readability
// horror show for readability
// DF: ok, but every if() could set a bool, and then the code to actually
// run in there (excludeTypes etc.) could be done only in one place.
// AJS: fair enough, let thy will be done =)
// first check if we have an all mimetype
bool checkTheMimetypes = false;
if (*it == "all/all" ||
*it == "allfiles" /*compat with KDE up to 3.0.3*/)
{
ok = true;
for (QStringList::iterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex)
{
if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) ||
((*itex) == m_sMimeType) )
{
ok = false;
break;
}
}
checkTheMimetypes = true;
}
// next, do we match all files?
@ -696,17 +689,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
!isDirectory &&
*it == "all/allfiles")
{
ok = true;
for (QStringList::iterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex)
{
if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) ||
((*itex) == m_sMimeType) )
{
ok = false;
break;
}
}
checkTheMimetypes = true;
}
// if we have a mimetype, see if we have an exact or a type globbed match
@ -716,6 +699,11 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
(!mimeGroup.isEmpty() &&
((*it).right(1) == "*" &&
(*it).left((*it).find('/')) == mimeGroup)))
{
checkTheMimetypes = true;
}
if (checkTheMimetypes)
{
ok = true;
for (QStringList::iterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex)