summaryrefslogtreecommitdiffstats
path: root/kcontrol/tdm/tdm-appear.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/tdm/tdm-appear.cpp')
-rw-r--r--kcontrol/tdm/tdm-appear.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 8e49087d1..c057867d1 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -40,7 +40,7 @@
#include <kimageio.h>
#include <kcombobox.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
#include <kurldrag.h>
@@ -51,7 +51,7 @@
#include "config.h"
-extern KSimpleConfig *config;
+extern TDESimpleConfig *config;
#define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock"
@@ -76,8 +76,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
greetstr_lined = new KLineEdit(group);
TQLabel *label = new TQLabel(greetstr_lined, i18n("&Greeting:"), group);
hlay->addWidget(label);
- connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(changed()));
+ connect(greetstr_lined, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(changed()));
hlay->addWidget(greetstr_lined);
wtstr = i18n("This is the \"headline\" for TDM's login window. You may want to "
"put some nice greeting or information about the operating system here.<p>"
@@ -107,8 +107,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
logoRadio = new TQRadioButton( i18n("Sho&w logo"), group );
TQButtonGroup *buttonGroup = new TQButtonGroup( group );
label->setBuddy( buttonGroup );
- connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotAreaRadioClicked(int)) );
- connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()) );
+ connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotAreaRadioClicked(int)) );
+ connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed()) );
buttonGroup->hide();
buttonGroup->insert(noneRadio, KdmNone);
buttonGroup->insert(clockRadio, KdmClock);
@@ -128,9 +128,9 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
logobutton->setAutoDefault(false);
logobutton->setAcceptDrops(true);
logobutton->installEventFilter(this); // for drag and drop
- connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked()));
+ connect(logobutton, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogoButtonClicked()));
hglay->addWidget(logoLabel, 1, 0);
- hglay->addWidget(logobutton, 1, 1, Qt::AlignCenter);
+ hglay->addWidget(logobutton, 1, 1, TQt::AlignCenter);
hglay->addRowSpacing(1, 110);
wtstr = i18n("Click here to choose an image that TDM will display. "
"You can also drag and drop an image onto this button "
@@ -145,19 +145,19 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
grid->addLayout(hglay, 2, 1);
label = new TQLabel(i18n("Position:"), group);
- hglay->addMultiCellWidget(label, 0,1, 0,0, Qt::AlignVCenter);
- TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group));
+ hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter);
+ TQValidator *posValidator = new TQIntValidator(0, 100, group);
TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group);
hglay->addWidget(xLineLabel, 0, 1);
xLineEdit = new TQLineEdit (group);
- connect( xLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
+ connect( xLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() ));
hglay->addWidget(xLineEdit, 0, 2);
xLineLabel->setBuddy(xLineEdit);
xLineEdit->setValidator(posValidator);
TQLabel *yLineLabel = new TQLabel(i18n("&Y:"), group);
hglay->addWidget(yLineLabel, 1, 1);
yLineEdit = new TQLineEdit (group);
- connect( yLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() ));
+ connect( yLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() ));
hglay->addWidget(yLineEdit, 1, 2);
yLineLabel->setBuddy(yLineEdit);
yLineEdit->setValidator(posValidator);
@@ -179,7 +179,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
compositorcombo->insertItem( "", i18n("None") );
compositorcombo->insertItem( TDE_COMPOSITOR_BINARY, i18n("Trinity compositor") );
label = new TQLabel(compositorcombo, i18n("Compositor:"), group);
- connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(compositorcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
hglay->addWidget(label, 0, 0);
hglay->addWidget(compositorcombo, 0, 1);
wtstr = i18n("Choose a compositor to be used in TDM. Note that the chosen compositor will continue to run after login.");
@@ -191,7 +191,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
loadGuiStyles(guicombo);
guicombo->listBox()->sort();
label = new TQLabel(guicombo, i18n("GUI s&tyle:"), group);
- connect(guicombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(guicombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
hglay->addWidget(label, 1, 0);
hglay->addWidget(guicombo, 1, 1);
wtstr = i18n("You can choose a basic GUI style here that will be "
@@ -204,7 +204,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
loadColorSchemes(colcombo);
colcombo->listBox()->sort();
label = new TQLabel(colcombo, i18n("&Color scheme:"), group);
- connect(colcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(colcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
hglay->addWidget(label, 2, 0);
hglay->addWidget(colcombo, 2, 1);
wtstr = i18n("You can choose a basic Color Scheme here that will be "
@@ -217,7 +217,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
echocombo->insertItem("OneStar", i18n("One Star"));
echocombo->insertItem("ThreeStars", i18n("Three Stars"));
label = new TQLabel(echocombo, i18n("Echo &mode:"), group);
- connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
+ connect(echocombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
hglay->addWidget(label, 3, 0);
hglay->addWidget(echocombo, 3, 1);
wtstr = i18n("You can choose whether and how TDM shows your password when you type it.");
@@ -226,12 +226,12 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
// The Language group box
- group = new TQGroupBox(0, Qt::Vertical, i18n("Locale"), this);
+ group = new TQGroupBox(0, TQt::Vertical, i18n("Locale"), this);
vbox->addWidget(group);
langcombo = new KLanguageButton(group);
loadLanguageList(langcombo);
- connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
+ connect(langcombo, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed()));
label = new TQLabel(langcombo, i18n("Languag&e:"), group);
TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
hbox->setColStretch(1, 1);
@@ -243,11 +243,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
TQWhatsThis::add( langcombo, wtstr );
// The SAK group box
- group = new TQGroupBox(0, Qt::Vertical, i18n("Secure Attention Key"), this);
+ group = new TQGroupBox(0, TQt::Vertical, i18n("Secure Attention Key"), this);
vbox->addWidget(group);
sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group );
- connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) );
+ connect( sakbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) );
TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
hbox2->setColStretch(1, 1);
hbox2->addWidget(sakbox, 1, 0);
@@ -262,11 +262,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
TQWhatsThis::add( sakbox, wtstr );
// Keyboard group box
- group = new TQGroupBox(0, Qt::Vertical, i18n("Keyboard"), this);
+ group = new TQGroupBox(0, TQt::Vertical, i18n("Keyboard"), this);
vbox->addWidget(group);
kbdledbox = new TQCheckBox(i18n("Sync keyboard led status"), group);
- connect(kbdledbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+ connect(kbdledbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
TQGridLayout *hbox3 = new TQGridLayout(group->layout(), 2, 2, KDialog::spacingHint());
hbox3->setColStretch(1, 1);
hbox3->addWidget(kbdledbox, 1, 0);
@@ -277,8 +277,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
void TDMAppearanceWidget::makeReadOnly()
{
- disconnect( logobutton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotLogoButtonClicked()) );
+ disconnect( logobutton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotLogoButtonClicked()) );
logobutton->setAcceptDrops(false);
greetstr_lined->setReadOnly(true);
noneRadio->setEnabled(false);
@@ -307,7 +307,7 @@ void TDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
int index = fpath.findRev('/');
TQString nid = fpath.mid(index + 1);
- KSimpleConfig entry(*it);
+ TDESimpleConfig 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);
@@ -321,7 +321,7 @@ void TDMAppearanceWidget::loadColorSchemes(KBackedComboBox *combo)
findAllResources("data", "tdedisplay/color-schemes/*.kcsrc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
- KSimpleConfig config(*it, true);
+ TDESimpleConfig config(*it, true);
config.setGroup("Color Scheme");
TQString str;
@@ -342,7 +342,7 @@ void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
findAllResources("data", "tdestyle/themes/*.themerc", false, true);
for (TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
- KSimpleConfig config(*it, true);
+ TDESimpleConfig config(*it, true);
if (!(config.hasGroup("KDE") && config.hasGroup("Misc")))
continue;
@@ -370,7 +370,7 @@ bool TDMAppearanceWidget::setLogo(TQString logo)
if (p.isNull())
return false;
if (p.width() > 100 || p.height() > 100)
- p = p.smoothScale(100, 100, TQ_ScaleMin);
+ p = p.smoothScale(100, 100, TQImage::ScaleMin);
logobutton->setPixmap(p);
uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
logobutton->setFixedSize(p.width() + bd, p.height() + bd);