summaryrefslogtreecommitdiffstats
path: root/kcontrol/kdm
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kdm')
-rw-r--r--kcontrol/kdm/kbackedcombobox.cpp2
-rw-r--r--kcontrol/kdm/kdm-appear.cpp4
-rw-r--r--kcontrol/kdm/kdm-conv.cpp10
-rw-r--r--kcontrol/kdm/kdm-users.cpp12
-rw-r--r--kcontrol/kdm/main.cpp16
5 files changed, 22 insertions, 22 deletions
diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp
index 9f651b433..1ba598e49 100644
--- a/kcontrol/kdm/kbackedcombobox.cpp
+++ b/kcontrol/kdm/kbackedcombobox.cpp
@@ -28,7 +28,7 @@ void KBackedComboBox::insertItem( const TQString &id, const TQString &name )
void KBackedComboBox::setCurrentId( const TQString &id )
{
- if (id2name.tqcontains( id ))
+ if (id2name.contains( id ))
setCurrentItem( id2name[id] );
else
setCurrentItem( 0 );
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 5f8b116dc..08c412c26 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -256,7 +256,7 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
it != langlist.end(); ++it )
{
TQString fpath = (*it).left((*it).length() - 14);
- int index = fpath.tqfindRev('/');
+ int index = fpath.findRev('/');
TQString nid = fpath.mid(index + 1);
KSimpleConfig entry(*it);
@@ -280,7 +280,7 @@ void KDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
if (!(str = config.readEntry("Name")).isEmpty() ||
!(str = config.readEntry("name")).isEmpty())
{
- TQString str2 = (*it).mid( (*it).tqfindRev( '/' ) + 1 ); // strip off path
+ TQString str2 = (*it).mid( (*it).findRev( '/' ) + 1 ); // strip off path
str2.setLength( str2.length() - 6 ); // strip off ".kcsrc
combo->insertItem( str2, str );
}
diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp
index 94e64debb..e7f267ce3 100644
--- a/kcontrol/kdm/kdm-conv.cpp
+++ b/kcontrol/kdm/kdm-conv.cpp
@@ -295,7 +295,7 @@ void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item )
if ( !item )
return;
TQCheckListItem *itm = (TQCheckListItem *)item;
- TQStringList::iterator it = noPassUsers.tqfind( itm->text() );
+ TQStringList::iterator it = noPassUsers.find( itm->text() );
if (itm->isOn()) {
if (it == noPassUsers.end())
noPassUsers.append( itm->text() );
@@ -328,7 +328,7 @@ void KDMConvenienceWidget::slotAddUsers(const TQMap<TQString,int> &users)
}
if (it.data() != 0)
(new TQCheckListItem(npuserlv, it.key(), TQCheckListItem::CheckBox))->
- setOn(noPassUsers.tqfind(it.key()) != noPassUsers.end());
+ setOn(noPassUsers.find(it.key()) != noPassUsers.end());
}
if (userlb->listBox())
@@ -349,13 +349,13 @@ void KDMConvenienceWidget::slotDelUsers(const TQMap<TQString,int> &users)
if (it.data() > 0) {
if (it.key() != autoUser && userlb->listBox())
delete userlb->listBox()->
- tqfindItem( it.key(), ExactMatch | CaseSensitive );
+ findItem( it.key(), ExactMatch | CaseSensitive );
if (it.key() != preselUser && puserlb->listBox())
delete puserlb->listBox()->
- tqfindItem( it.key(), ExactMatch | CaseSensitive );
+ findItem( it.key(), ExactMatch | CaseSensitive );
}
if (it.data() != 0)
- delete npuserlv->tqfindItem( it.key(), 0 );
+ delete npuserlv->findItem( it.key(), 0 );
}
}
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index da6025026..d349b7da7 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -381,7 +381,7 @@ void KDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list )
if ( !item )
return;
TQCheckListItem *itm = (TQCheckListItem *)item;
- TQStringList::iterator it = list.tqfind( itm->text() );
+ TQStringList::iterator it = list.find( itm->text() );
if (itm->isOn()) {
if (it == list.end())
list.append( itm->text() );
@@ -415,9 +415,9 @@ void KDMUsersWidget::slotAddUsers(const TQMap<TQString,int> &users)
for (it = users.begin(); it != users.end(); ++it) {
const TQString *name = &it.key();
(new TQCheckListItem(optinlv, *name, TQCheckListItem::CheckBox))->
- setOn(selectedUsers.tqfind(*name) != selectedUsers.end());
+ setOn(selectedUsers.find(*name) != selectedUsers.end());
(new TQCheckListItem(optoutlv, *name, TQCheckListItem::CheckBox))->
- setOn(hiddenUsers.tqfind(*name) != hiddenUsers.end());
+ setOn(hiddenUsers.find(*name) != hiddenUsers.end());
if ((*name)[0] != '@')
usercombo->insertItem(*name);
}
@@ -433,9 +433,9 @@ void KDMUsersWidget::slotDelUsers(const TQMap<TQString,int> &users)
for (it = users.begin(); it != users.end(); ++it) {
const TQString *name = &it.key();
if (usercombo->listBox())
- delete usercombo->listBox()->tqfindItem( *name, ExactMatch | CaseSensitive );
- delete optinlv->tqfindItem( *name, 0 );
- delete optoutlv->tqfindItem( *name, 0 );
+ delete usercombo->listBox()->findItem( *name, ExactMatch | CaseSensitive );
+ delete optinlv->findItem( *name, 0 );
+ delete optoutlv->findItem( *name, 0 );
}
}
diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp
index 103e60428..00239636c 100644
--- a/kcontrol/kdm/main.cpp
+++ b/kcontrol/kdm/main.cpp
@@ -132,9 +132,9 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
struct passwd *ps;
for (setpwent(); (ps = getpwent()); ) {
TQString un( TQFile::decodeName( ps->pw_name ) );
- if (usermap.tqfind( un ) == usermap.end()) {
+ if (usermap.find( un ) == usermap.end()) {
usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) );
- if ((tgmapi = tgmap.tqfind( ps->pw_gid )) != tgmap.end())
+ if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
(*tgmapi).append( un );
else
tgmap[ps->pw_gid] = un;
@@ -146,7 +146,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
for (setgrent(); (grp = getgrent()); ) {
TQString gn( TQFile::decodeName( grp->gr_name ) );
bool delme = false;
- if ((tgmapi = tgmap.tqfind( grp->gr_gid )) != tgmap.end()) {
+ if ((tgmapi = tgmap.find( grp->gr_gid )) != tgmap.end()) {
if ((*tgmapi).count() == 1 && (*tgmapi).first() == gn)
delme = true;
else
@@ -160,8 +160,8 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
continue;
do {
TQString un( TQFile::decodeName( *grp->gr_mem ) );
- if ((umapi = usermap.tqfind( un )) != usermap.end()) {
- if ((*umapi).second.tqfind( gn ) == (*umapi).second.end())
+ if ((umapi = usermap.find( un )) != usermap.end()) {
+ if ((*umapi).second.find( gn ) == (*umapi).second.end())
(*umapi).second.append( gn );
} else
kdWarning() << "group '" << gn << "' contains unknown user '" << un << "'" << endl;
@@ -281,7 +281,7 @@ void KDModule::propagateUsers()
if (!uid || (uid >= minshowuid && uid <= maxshowuid)) {
lusers[it.key()] = uid;
for (jt = it.data().second.begin(); jt != it.data().second.end(); ++jt)
- if ((gmapi = groupmap.tqfind( *jt )) == groupmap.end()) {
+ if ((gmapi = groupmap.find( *jt )) == groupmap.end()) {
groupmap[*jt] = 1;
lusers['@' + *jt] = -uid;
} else
@@ -307,7 +307,7 @@ void KDModule::slotMinMaxUID(int min, int max)
dlusers[it.key()] = uid;
for (jt = it.data().second.begin();
jt != it.data().second.end(); ++jt) {
- gmapi = groupmap.tqfind( *jt );
+ gmapi = groupmap.find( *jt );
if (!--(*gmapi)) {
groupmap.remove( gmapi );
dlusers['@' + *jt] = -uid;
@@ -319,7 +319,7 @@ void KDModule::slotMinMaxUID(int min, int max)
alusers[it.key()] = uid;
for (jt = it.data().second.begin();
jt != it.data().second.end(); ++jt)
- if ((gmapi = groupmap.tqfind( *jt )) == groupmap.end()) {
+ if ((gmapi = groupmap.find( *jt )) == groupmap.end()) {
groupmap[*jt] = 1;
alusers['@' + *jt] = -uid;
} else
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 19:41:45 +0000