summaryrefslogtreecommitdiffstats
path: root/kcontrol/kdm
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kdm')
-rw-r--r--kcontrol/kdm/ChangeLog2
-rw-r--r--kcontrol/kdm/background.cpp4
-rw-r--r--kcontrol/kdm/kbackedcombobox.cpp2
-rw-r--r--kcontrol/kdm/kdm-appear.cpp20
-rw-r--r--kcontrol/kdm/kdm-conv.cpp4
-rw-r--r--kcontrol/kdm/kdm-users.cpp14
-rw-r--r--kcontrol/kdm/main.cpp4
7 files changed, 25 insertions, 25 deletions
diff --git a/kcontrol/kdm/ChangeLog b/kcontrol/kdm/ChangeLog
index 167e413a6..d49bb2548 100644
--- a/kcontrol/kdm/ChangeLog
+++ b/kcontrol/kdm/ChangeLog
@@ -10,7 +10,7 @@
* Few bug fixes
1998-04-28 Thomas Tanghus <tanghus@earthling.net>
- * Improved tqgeometry management.
+ * Improved geometry management.
1998-05-14 Thomas Tanghus <tanghus@earthling.net>
* Fixed bug with "ShutDownButton=...".
diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp
index 80879fe8c..b5ce18ff5 100644
--- a/kcontrol/kdm/background.cpp
+++ b/kcontrol/kdm/background.cpp
@@ -4,7 +4,7 @@
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
*
* Modified 2000.07.14 by Brad Hughes <bhughes@trolltech.com>
- * Improve tqlayout and consistency with KDesktop's background selection
+ * Improve layout and consistency with KDesktop's background selection
*
* Based on old backgnd.cpp:
*
@@ -56,7 +56,7 @@ KBackground::KBackground(TQWidget *parent, const char *name)
connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
- // Top tqlayout
+ // Top layout
TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() );
top->addWidget(m_pCBEnable);
top->addWidget(m_background);
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 7f68deb3b..58696902b 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -216,7 +216,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
loadLanguageList(langcombo);
connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
label = new TQLabel(langcombo, i18n("Languag&e:"), group);
- TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
+ TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
hbox->setColStretch(1, 1);
hbox->addWidget(label, 1, 0);
hbox->addWidget(langcombo, 1, 1);
@@ -250,7 +250,7 @@ void KDMAppearanceWidget::makeReadOnly()
void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
{
TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
- TQString::tqfromLatin1("*/entry.desktop"));
+ TQString::fromLatin1("*/entry.desktop"));
langlist.sort();
for ( TQStringList::ConstIterator it = langlist.begin();
it != langlist.end(); ++it )
@@ -260,9 +260,9 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
TQString nid = fpath.mid(index + 1);
KSimpleConfig entry(*it);
- 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);
+ 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);
}
}
@@ -316,7 +316,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
bool KDMAppearanceWidget::setLogo(TQString logo)
{
TQString flogo = logo.isEmpty() ?
- locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) :
+ locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
logo;
TQImage p(flogo);
if (p.isNull())
@@ -324,7 +324,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
if (p.width() > 100 || p.height() > 100)
p = p.smoothScale(100, 100, TQImage::ScaleMin);
logobutton->setPixmap(p);
- uint bd = style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+ uint bd = style().pixelMetric( 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::tqfromLatin1("kdm/pics/")),
+ KFileDialog dialogue(locate("data", TQString::fromLatin1("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, tqparentWidget());
+ KIO::NetAccess::copy(*url, pixurl, parentWidget());
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, tqparentWidget());
+ KIO::NetAccess::del(pixurl, parentWidget());
TQString msg = i18n("There was an error loading the image:\n"
"%1\n"
"It will not be saved.")
diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp
index e7f267ce3..155d5b380 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->tqsetSizePolicy( vpref );
+ alGroup->setSizePolicy( 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->tqsetSizePolicy( vpref );
+ puGroup->setSizePolicy( vpref );
connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged()));
connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index d6c1eaf7d..ce27f6498 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -94,14 +94,14 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
leminuid = new KLineEdit( minGroup );
minlab->setBuddy( leminuid );
- leminuid->tqsetSizePolicy( sp_ign_fix );
+ leminuid->setSizePolicy( 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->tqsetSizePolicy( sp_ign_fix );
+ lemaxuid->setSizePolicy( 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().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
+ uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
userbutton->setFixedSize( sz, sz );
connect( userbutton, TQT_SIGNAL(clicked()),
TQT_SLOT(slotUserButtonClicked()) );
@@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
KURL *url = decodeImgDrop(e, this);
if (url) {
TQString pixpath;
- KIO::NetAccess::download(*url, pixpath, tqparentWidget());
+ KIO::NetAccess::download(*url, pixpath, parentWidget());
changeUserPix( pixpath );
KIO::NetAccess::removeTempFile(pixpath);
delete url;
@@ -457,11 +457,11 @@ void KDMUsersWidget::load()
cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
TQString ps = config->readEntry( "FaceSource" );
- if (ps == TQString::tqfromLatin1("UserOnly"))
+ if (ps == TQString::fromLatin1("UserOnly"))
rbusronly->setChecked(true);
- else if (ps == TQString::tqfromLatin1("PreferUser"))
+ else if (ps == TQString::fromLatin1("PreferUser"))
rbprefusr->setChecked(true);
- else if (ps == TQString::tqfromLatin1("PreferAdmin"))
+ else if (ps == TQString::fromLatin1("PreferAdmin"))
rbprefadm->setChecked(true);
else
rbadmonly->setChecked(true);
diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp
index f342985aa..ae99b51f5 100644
--- a/kcontrol/kdm/main.cpp
+++ b/kcontrol/kdm/main.cpp
@@ -164,7 +164,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
if ((*umapi).second.find( gn ) == (*umapi).second.end())
(*umapi).second.append( gn );
} else
- kdWarning() << "group '" << gn << "' tqcontains unknown user '" << un << "'" << endl;
+ kdWarning() << "group '" << gn << "' contains unknown user '" << un << "'" << endl;
} while (*++grp->gr_mem);
}
endgrent();
@@ -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::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+ config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
TQVBoxLayout *top = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 15:36:34 +0000