summaryrefslogtreecommitdiffstats
path: root/kcontrol/kdm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
commit2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch)
tree65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /kcontrol/kdm
parent73c08b592db45af554b9f21029bc549d70f683ab (diff)
downloadtdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz
tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'kcontrol/kdm')
-rw-r--r--kcontrol/kdm/background.cpp2
-rw-r--r--kcontrol/kdm/kdm-appear.cpp20
-rw-r--r--kcontrol/kdm/kdm-conv.cpp6
-rw-r--r--kcontrol/kdm/kdm-font.cpp2
-rw-r--r--kcontrol/kdm/kdm-shut.cpp2
-rw-r--r--kcontrol/kdm/kdm-users.cpp14
-rw-r--r--kcontrol/kdm/main.cpp6
7 files changed, 26 insertions, 26 deletions
diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp
index 483684706..b5ce18ff5 100644
--- a/kcontrol/kdm/background.cpp
+++ b/kcontrol/kdm/background.cpp
@@ -24,7 +24,7 @@
#include <sys/types.h>
#include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <kdebug.h>
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 592d782e2..651cd8782 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -25,7 +25,7 @@
#include <tqbuttongroup.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqradiobutton.h>
#include <tqwhatsthis.h>
#include <tqvalidator.h>
@@ -228,7 +228,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->layout(), 2, 2, KDialog::spacingHint() );
+ TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
hbox->setColStretch(1, 1);
hbox->addWidget(label, 1, 0);
hbox->addWidget(langcombo, 1, 1);
@@ -244,7 +244,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
- TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
+ TQGridLayout *hbox2 = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
hbox2->setColStretch(1, 1);
hbox2->addWidget(sakbox, 1, 0);
wtstr = i18n("Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure.");
@@ -277,7 +277,7 @@ 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 )
@@ -287,9 +287,9 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
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);
}
}
@@ -343,7 +343,7 @@ 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())
@@ -351,7 +351,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
if (p.width() > 100 || p.height() > 100)
p = p.smoothScale(100, 100, TQ_ScaleMin);
logobutton->setPixmap(p);
- uint bd = tqstyle().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;
@@ -361,7 +361,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 );
diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp
index dd3429d34..e7f267ce3 100644
--- a/kcontrol/kdm/kdm-conv.cpp
+++ b/kcontrol/kdm/kdm-conv.cpp
@@ -23,7 +23,7 @@
#include <sys/types.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqhgroupbox.h>
#include <tqvgroupbox.h>
@@ -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()));
diff --git a/kcontrol/kdm/kdm-font.cpp b/kcontrol/kdm/kdm-font.cpp
index 19f5021bf..af83176b1 100644
--- a/kcontrol/kdm/kdm-font.cpp
+++ b/kcontrol/kdm/kdm-font.cpp
@@ -24,7 +24,7 @@
#include <tqapplication.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
diff --git a/kcontrol/kdm/kdm-shut.cpp b/kcontrol/kdm/kdm-shut.cpp
index 1b3025e61..3b442956a 100644
--- a/kcontrol/kdm/kdm-shut.cpp
+++ b/kcontrol/kdm/kdm-shut.cpp
@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <ksimpleconfig.h>
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index c40759e9c..d349b7da7 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -21,7 +21,7 @@
#include <sys/types.h>
#include <tqstyle.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqtooltip.h>
#include <tqvalidator.h>
@@ -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->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 = tqstyle().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()) );
@@ -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/main.cpp b/kcontrol/kdm/main.cpp
index 081633d6f..02ec37f9b 100644
--- a/kcontrol/kdm/main.cpp
+++ b/kcontrol/kdm/main.cpp
@@ -23,7 +23,7 @@
#include <config.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kaboutdata.h>
#include <kgenericfactory.h>
@@ -175,10 +175,10 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
struct stat st;
if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) {
- config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
+ config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
}
else {
- config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+ config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
}
TQVBoxLayout *top = new TQVBoxLayout(this);