summaryrefslogtreecommitdiffstats
path: root/kcontrol/kdm
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kdm')
-rw-r--r--kcontrol/kdm/background.h2
-rw-r--r--kcontrol/kdm/kbackedcombobox.cpp2
-rw-r--r--kcontrol/kdm/kdm-appear.cpp32
-rw-r--r--kcontrol/kdm/kdm-appear.h2
-rw-r--r--kcontrol/kdm/kdm-conv.cpp14
-rw-r--r--kcontrol/kdm/kdm-conv.h16
-rw-r--r--kcontrol/kdm/kdm-font.h4
-rw-r--r--kcontrol/kdm/kdm-shut.h6
-rw-r--r--kcontrol/kdm/kdm-users.cpp38
-rw-r--r--kcontrol/kdm/kdm-users.h30
-rw-r--r--kcontrol/kdm/main.cpp18
-rw-r--r--kcontrol/kdm/main.h2
12 files changed, 83 insertions, 83 deletions
diff --git a/kcontrol/kdm/background.h b/kcontrol/kdm/background.h
index 76b0070c3..2e5182b16 100644
--- a/kcontrol/kdm/background.h
+++ b/kcontrol/kdm/background.h
@@ -20,7 +20,7 @@ class KGlobalBackgroundSettings;
class TQCheckBox;
class TQLabel;
-class KBackground: public QWidget
+class KBackground: public TQWidget
{
Q_OBJECT
public:
diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp
index 1ba598e49..9f651b433 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.contains( id ))
+ if (id2name.tqcontains( id ))
setCurrentItem( id2name[id] );
else
setCurrentItem( 0 );
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 58696902b..90631e3bf 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -124,7 +124,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
logobutton->installEventFilter(this); // for drag and drop
connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked()));
hglay->addWidget(logoLabel, 1, 0);
- hglay->addWidget(logobutton, 1, 1, AlignCenter);
+ hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter);
hglay->addRowSpacing(1, 110);
wtstr = i18n("Click here to choose an image that KDM will display. "
"You can also drag and drop an image onto this button "
@@ -139,8 +139,8 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
grid->addLayout(hglay, 2, 1);
label = new TQLabel(i18n("Position:"), group);
- hglay->addMultiCellWidget(label, 0,1, 0,0, AlignVCenter);
- TQValidator *posValidator = new TQIntValidator(0, 100, group);
+ hglay->addMultiCellWidget(label, 0,1, 0,0, Qt::AlignVCenter);
+ TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group));
TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group);
hglay->addWidget(xLineLabel, 0, 1);
xLineEdit = new TQLineEdit (group);
@@ -209,7 +209,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
// The Language group box
- group = new TQGroupBox(0, Vertical, i18n("Locale"), this);
+ group = new TQGroupBox(0, Qt::Vertical, i18n("Locale"), this);
vbox->addWidget(group);
langcombo = new KLanguageButton(group);
@@ -250,19 +250,19 @@ void KDMAppearanceWidget::makeReadOnly()
void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
{
TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
- TQString::fromLatin1("*/entry.desktop"));
+ TQString::tqfromLatin1("*/entry.desktop"));
langlist.sort();
for ( TQStringList::ConstIterator it = langlist.begin();
it != langlist.end(); ++it )
{
TQString fpath = (*it).left((*it).length() - 14);
- int index = fpath.findRev('/');
+ int index = fpath.tqfindRev('/');
TQString nid = fpath.mid(index + 1);
KSimpleConfig entry(*it);
- entry.setGroup(TQString::fromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
- combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null);
+ entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+ combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null);
}
}
@@ -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).findRev( '/' ) + 1 ); // strip off path
+ TQString str2 = (*it).mid( (*it).tqfindRev( '/' ) + 1 ); // strip off path
str2.setLength( str2.length() - 6 ); // strip off ".kcsrc
combo->insertItem( str2, str );
}
@@ -316,15 +316,15 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
bool KDMAppearanceWidget::setLogo(TQString logo)
{
TQString flogo = logo.isEmpty() ?
- locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
+ locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) :
logo;
TQImage p(flogo);
if (p.isNull())
return false;
if (p.width() > 100 || p.height() > 100)
- p = p.smoothScale(100, 100, TQImage::ScaleMin);
+ p = p.smoothScale(100, 100, TQ_ScaleMin);
logobutton->setPixmap(p);
- uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+ uint bd = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
logobutton->setFixedSize(p.width() + bd, p.height() + bd);
logopath = logo;
return true;
@@ -334,7 +334,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
void KDMAppearanceWidget::slotLogoButtonClicked()
{
KImageIO::registerFormats();
- KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")),
+ KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")),
KImageIO::pattern( KImageIO::Reading ),
this, 0, true);
dialogue.setOperationMode( KFileDialog::Opening );
@@ -392,7 +392,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
if(!url->isLocalFile()) {
pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
"kdm/pics/" + url->fileName());
- KIO::NetAccess::copy(*url, pixurl, parentWidget());
+ KIO::NetAccess::copy(*url, pixurl, tqparentWidget());
istmp = true;
} else {
pixurl = *url;
@@ -401,7 +401,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
// By now url should be "file:/..."
if (!setLogo(pixurl.path())) {
- KIO::NetAccess::del(pixurl, parentWidget());
+ KIO::NetAccess::del(pixurl, tqparentWidget());
TQString msg = i18n("There was an error loading the image:\n"
"%1\n"
"It will not be saved.")
diff --git a/kcontrol/kdm/kdm-appear.h b/kcontrol/kdm/kdm-appear.h
index 3481635b6..91aad8173 100644
--- a/kcontrol/kdm/kdm-appear.h
+++ b/kcontrol/kdm/kdm-appear.h
@@ -42,7 +42,7 @@ class TQLineEdit;
class KLineEdit;
-class KDMAppearanceWidget : public QWidget
+class KDMAppearanceWidget : public TQWidget
{
Q_OBJECT
diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp
index 155d5b380..94e64debb 100644
--- a/kcontrol/kdm/kdm-conv.cpp
+++ b/kcontrol/kdm/kdm-conv.cpp
@@ -50,7 +50,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this );
alGroup->setCheckable( true );
- alGroup->setSizePolicy( vpref );
+ alGroup->tqsetSizePolicy( vpref );
TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
" This applies only to KDM's graphical login."
@@ -92,7 +92,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
puGroup = new TQVButtonGroup(i18n("Preselect User"), this );
- puGroup->setSizePolicy( vpref );
+ puGroup->tqsetSizePolicy( vpref );
connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged()));
connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));
@@ -295,7 +295,7 @@ void KDMConvenienceWidget::slotUpdateNoPassUser( TQListViewItem *item )
if ( !item )
return;
TQCheckListItem *itm = (TQCheckListItem *)item;
- TQStringList::iterator it = noPassUsers.find( itm->text() );
+ TQStringList::iterator it = noPassUsers.tqfind( 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.find(it.key()) != noPassUsers.end());
+ setOn(noPassUsers.tqfind(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()->
- findItem( it.key(), ExactMatch | CaseSensitive );
+ tqfindItem( it.key(), ExactMatch | CaseSensitive );
if (it.key() != preselUser && puserlb->listBox())
delete puserlb->listBox()->
- findItem( it.key(), ExactMatch | CaseSensitive );
+ tqfindItem( it.key(), ExactMatch | CaseSensitive );
}
if (it.data() != 0)
- delete npuserlv->findItem( it.key(), 0 );
+ delete npuserlv->tqfindItem( it.key(), 0 );
}
}
diff --git a/kcontrol/kdm/kdm-conv.h b/kcontrol/kdm/kdm-conv.h
index 611ab9797..be8bebf35 100644
--- a/kcontrol/kdm/kdm-conv.h
+++ b/kcontrol/kdm/kdm-conv.h
@@ -39,7 +39,7 @@
#include <pwd.h>
-class KDMConvenienceWidget : public QWidget
+class KDMConvenienceWidget : public TQWidget
{
Q_OBJECT
@@ -68,15 +68,15 @@ private slots:
void slotUpdateNoPassUser( TQListViewItem *item );
private:
- QGroupBox *alGroup, *puGroup, *npGroup, *btGroup;
- QCheckBox *againcb, *cbarlen, *cbjumppw, *autoLockCheck;
- QRadioButton *npRadio, *ppRadio, *spRadio;
+ TQGroupBox *alGroup, *puGroup, *npGroup, *btGroup;
+ TQCheckBox *againcb, *cbarlen, *cbjumppw, *autoLockCheck;
+ TQRadioButton *npRadio, *ppRadio, *spRadio;
KComboBox *userlb, *puserlb;
- QSpinBox *delaysb;
+ TQSpinBox *delaysb;
KListView *npuserlv;
- QLabel *u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label;
- QString autoUser, preselUser;
- QStringList noPassUsers;
+ TQLabel *u_label, *d_label, *pu_label, *w_label, *n_label, *pl_label;
+ TQString autoUser, preselUser;
+ TQStringList noPassUsers;
};
#endif
diff --git a/kcontrol/kdm/kdm-font.h b/kcontrol/kdm/kdm-font.h
index 427da8e8b..c636a6f90 100644
--- a/kcontrol/kdm/kdm-font.h
+++ b/kcontrol/kdm/kdm-font.h
@@ -25,7 +25,7 @@
class KFontRequester;
class TQCheckBox;
-class KDMFontWidget : public QWidget
+class KDMFontWidget : public TQWidget
{
Q_OBJECT
@@ -45,7 +45,7 @@ protected slots:
void set_def();
private:
- QCheckBox *aacb;
+ TQCheckBox *aacb;
KFontRequester *greetingFontChooser;
KFontRequester *failFontChooser;
KFontRequester *stdFontChooser;
diff --git a/kcontrol/kdm/kdm-shut.h b/kcontrol/kdm/kdm-shut.h
index b8513cac5..0e7cdb654 100644
--- a/kcontrol/kdm/kdm-shut.h
+++ b/kcontrol/kdm/kdm-shut.h
@@ -28,7 +28,7 @@ class TQCheckBox;
class KURLRequester;
class KBackedComboBox;
-class KDMSessionsWidget : public QWidget
+class KDMSessionsWidget : public TQWidget
{
Q_OBJECT
@@ -52,8 +52,8 @@ private:
void readSD (TQComboBox *, TQString);
void writeSD (TQComboBox *);
- QComboBox *sdlcombo, *sdrcombo;
- QLabel *sdllabel, *sdrlabel;
+ TQComboBox *sdlcombo, *sdrcombo;
+ TQLabel *sdllabel, *sdrlabel;
KURLRequester *restart_lined, *shutdown_lined;
KBackedComboBox *bm_combo;
};
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index ce27f6498..75139c284 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -85,23 +85,23 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
TQString wtstr;
- minGroup = new TQGroupBox( 2, Horizontal, i18n("System U&IDs"), this );
+ minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this );
TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by KDM and this setup dialog."
" Note that users with the UID 0 (typically root) are not affected by this and must be"
" explicitly hidden in \"Not hidden\" mode."));
TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed );
- TQValidator *valid = new TQIntValidator( 0, 999999, minGroup );
+ TQValidator *valid = new TQIntValidator( 0, 999999, TQT_TQOBJECT(minGroup) );
TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
leminuid = new KLineEdit( minGroup );
minlab->setBuddy( leminuid );
- leminuid->setSizePolicy( sp_ign_fix );
+ leminuid->tqsetSizePolicy( sp_ign_fix );
leminuid->setValidator( valid );
connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup );
lemaxuid = new KLineEdit( minGroup );
maxlab->setBuddy( lemaxuid );
- lemaxuid->setSizePolicy( sp_ign_fix );
+ lemaxuid->tqsetSizePolicy( sp_ign_fix );
lemaxuid->setValidator( valid );
connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
@@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
userbutton = new TQPushButton( hlpw );
userbutton->setAcceptDrops( true );
userbutton->installEventFilter( this ); // for drag and drop
- uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
+ uint sz = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
userbutton->setFixedSize( sz, sz );
connect( userbutton, TQT_SIGNAL(clicked()),
TQT_SLOT(slotUserButtonClicked()) );
@@ -183,8 +183,8 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
hlpl->addWidget( userlabel, 0, 0 );
// hlpl->addSpacing( KDialog::spacingHint() );
hlpl->addWidget( usercombo, 0, 1 );
- hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, AlignHCenter );
- hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, AlignHCenter );
+ hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, Qt::AlignHCenter );
+ hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, Qt::AlignHCenter );
TQHBoxLayout *main = new TQHBoxLayout( this, 10 );
@@ -263,7 +263,7 @@ void KDMUsersWidget::slotUserSelected()
p.load( m_userPixDir + ".default.face.icon" );
rstuserbutton->setEnabled( false );
}
- userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) );
+ userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) );
}
@@ -286,7 +286,7 @@ void KDMUsersWidget::changeUserPix(const TQString &pix)
return;
}
- p = p.smoothScale( 48, 48, TQImage::ScaleMin );
+ p = p.smoothScale( 48, 48, TQ_ScaleMin );
TQString userpix = m_userPixDir + user + ".face.icon";
if (!p.save( userpix, "PNG" ))
KMessageBox::sorry(this,
@@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
KURL *url = decodeImgDrop(e, this);
if (url) {
TQString pixpath;
- KIO::NetAccess::download(*url, pixpath, parentWidget());
+ KIO::NetAccess::download(*url, pixpath, tqparentWidget());
changeUserPix( pixpath );
KIO::NetAccess::removeTempFile(pixpath);
delete url;
@@ -381,7 +381,7 @@ void KDMUsersWidget::updateOptList( TQListViewItem *item, TQStringList &list )
if ( !item )
return;
TQCheckListItem *itm = (TQCheckListItem *)item;
- TQStringList::iterator it = list.find( itm->text() );
+ TQStringList::iterator it = list.tqfind( 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.find(*name) != selectedUsers.end());
+ setOn(selectedUsers.tqfind(*name) != selectedUsers.end());
(new TQCheckListItem(optoutlv, *name, TQCheckListItem::CheckBox))->
- setOn(hiddenUsers.find(*name) != hiddenUsers.end());
+ setOn(hiddenUsers.tqfind(*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()->findItem( *name, ExactMatch | CaseSensitive );
- delete optinlv->findItem( *name, 0 );
- delete optoutlv->findItem( *name, 0 );
+ delete usercombo->listBox()->tqfindItem( *name, ExactMatch | CaseSensitive );
+ delete optinlv->tqfindItem( *name, 0 );
+ delete optoutlv->tqfindItem( *name, 0 );
}
}
@@ -457,11 +457,11 @@ void KDMUsersWidget::load()
cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
TQString ps = config->readEntry( "FaceSource" );
- if (ps == TQString::fromLatin1("UserOnly"))
+ if (ps == TQString::tqfromLatin1("UserOnly"))
rbusronly->setChecked(true);
- else if (ps == TQString::fromLatin1("PreferUser"))
+ else if (ps == TQString::tqfromLatin1("PreferUser"))
rbprefusr->setChecked(true);
- else if (ps == TQString::fromLatin1("PreferAdmin"))
+ else if (ps == TQString::tqfromLatin1("PreferAdmin"))
rbprefadm->setChecked(true);
else
rbadmonly->setChecked(true);
diff --git a/kcontrol/kdm/kdm-users.h b/kcontrol/kdm/kdm-users.h
index 129f5301d..574a9d1ed 100644
--- a/kcontrol/kdm/kdm-users.h
+++ b/kcontrol/kdm/kdm-users.h
@@ -37,7 +37,7 @@
#include <pwd.h>
-class KDMUsersWidget : public QWidget
+class KDMUsersWidget : public TQWidget
{
Q_OBJECT
@@ -76,27 +76,27 @@ private:
void userButtonDropEvent( TQDropEvent *e );
void changeUserPix( const TQString & );
- QGroupBox *minGroup; // top left
- QLineEdit *leminuid, *lemaxuid;
+ TQGroupBox *minGroup; // top left
+ TQLineEdit *leminuid, *lemaxuid;
- QButtonGroup *usrGroup; // right below
- QCheckBox *cbshowlist, *cbcomplete, *cbinverted, *cbusrsrt;
+ TQButtonGroup *usrGroup; // right below
+ TQCheckBox *cbshowlist, *cbcomplete, *cbinverted, *cbusrsrt;
- QLabel *s_label; // middle
- QWidgetStack *wstack;
+ TQLabel *s_label; // middle
+ TQWidgetStack *wstack;
KListView *optoutlv, *optinlv;
- QButtonGroup *faceGroup; // right
- QRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;
+ TQButtonGroup *faceGroup; // right
+ TQRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;
KComboBox *usercombo; // right below
- QPushButton *userbutton;
- QPushButton *rstuserbutton;
+ TQPushButton *userbutton;
+ TQPushButton *rstuserbutton;
- QString m_userPixDir;
- QString m_defaultText;
- QStringList hiddenUsers, selectedUsers;
- QString defminuid, defmaxuid;
+ TQString m_userPixDir;
+ TQString m_defaultText;
+ TQStringList hiddenUsers, selectedUsers;
+ TQString defminuid, defmaxuid;
bool m_notFirst;
};
diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp
index ae99b51f5..103e60428 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.find( un ) == usermap.end()) {
+ if (usermap.tqfind( un ) == usermap.end()) {
usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) );
- if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
+ if ((tgmapi = tgmap.tqfind( 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.find( grp->gr_gid )) != tgmap.end()) {
+ if ((tgmapi = tgmap.tqfind( 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.find( un )) != usermap.end()) {
- if ((*umapi).second.find( gn ) == (*umapi).second.end())
+ if ((umapi = usermap.tqfind( un )) != usermap.end()) {
+ if ((*umapi).second.tqfind( gn ) == (*umapi).second.end())
(*umapi).second.append( gn );
} else
kdWarning() << "group '" << gn << "' contains unknown user '" << un << "'" << endl;
@@ -173,7 +173,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
kdWarning() << "user(s) '" << tgmapci.data().join(",")
<< "' have unknown GID " << tgmapci.key() << endl;
- config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+ config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
TQVBoxLayout *top = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
@@ -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.find( *jt )) == groupmap.end()) {
+ if ((gmapi = groupmap.tqfind( *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.find( *jt );
+ gmapi = groupmap.tqfind( *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.find( *jt )) == groupmap.end()) {
+ if ((gmapi = groupmap.tqfind( *jt )) == groupmap.end()) {
groupmap[*jt] = 1;
alusers['@' + *jt] = -uid;
} else
diff --git a/kcontrol/kdm/main.h b/kcontrol/kdm/main.h
index 8bec1a715..90e88ceb9 100644
--- a/kcontrol/kdm/main.h
+++ b/kcontrol/kdm/main.h
@@ -61,7 +61,7 @@ signals:
private:
- QTabWidget *tab;
+ TQTabWidget *tab;
KDMAppearanceWidget *appearance;
KBackground *background;