diff options
Diffstat (limited to 'kcontrol/tdm')
-rw-r--r-- | kcontrol/tdm/background.cpp | 4 | ||||
-rw-r--r-- | kcontrol/tdm/background.h | 2 | ||||
-rw-r--r-- | kcontrol/tdm/main.cpp | 34 | ||||
-rw-r--r-- | kcontrol/tdm/main.h | 4 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 46 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-appear.h | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-conv.cpp | 40 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-conv.h | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-font.cpp | 8 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-font.h | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-shut.cpp | 32 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-shut.h | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-users.cpp | 78 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-users.h | 2 |
14 files changed, 132 insertions, 126 deletions
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp index 832940d7d..c1f459924 100644 --- a/kcontrol/tdm/background.cpp +++ b/kcontrol/tdm/background.cpp @@ -54,14 +54,14 @@ KBackground::KBackground(TQWidget *parent, const char *name) m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) ); m_background = new BGDialog( this, m_simpleConf, false ); - connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(m_background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); // Top layout TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); top->addWidget(m_pCBEnable); top->addWidget(m_background); top->addStretch(); - connect( m_pCBEnable, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotEnableChanged()) ); + connect( m_pCBEnable, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotEnableChanged()) ); } KBackground::~KBackground() diff --git a/kcontrol/tdm/background.h b/kcontrol/tdm/background.h index ad708d485..74f1b09ec 100644 --- a/kcontrol/tdm/background.h +++ b/kcontrol/tdm/background.h @@ -22,7 +22,7 @@ class TQLabel; class KBackground: public TQWidget { - Q_OBJECT + TQ_OBJECT public: KBackground(TQWidget *parent=0, const char *name=0); ~KBackground(); diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 2a5f72895..71e09cb0d 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -127,13 +127,13 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) TQMap<gid_t,TQStringList> tgmap; TQMap<gid_t,TQStringList>::Iterator tgmapi; TQMap<gid_t,TQStringList>::ConstIterator tgmapci; - TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi; + TQMap<TQString, TQPair<int,TQStringList> >::Iterator umapi; struct passwd *ps; for (setpwent(); (ps = getpwent()); ) { TQString un( TQFile::decodeName( ps->pw_name ) ); if (usermap.find( un ) == usermap.end()) { - usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) ); + usermap.insert( un, TQPair<int,TQStringList>( ps->pw_uid, sl ) ); if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end()) (*tgmapi).append( un ); else @@ -190,34 +190,34 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) appearance = new TDMAppearanceWidget(this); tab->addTab(appearance, i18n("A&ppearance")); - connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool))); + connect(appearance, TQ_SIGNAL(changed(bool)), TQ_SIGNAL( changed(bool))); font = new TDMFontWidget(this); tab->addTab(font, i18n("&Font")); - connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(font, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); background = new KBackground(this); tab->addTab(background, i18n("&Background")); - connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); sessions = new TDMSessionsWidget(this); tab->addTab(sessions, i18n("&Shutdown")); - connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(sessions, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); users = new TDMUsersWidget(this, 0); tab->addTab(users, i18n("&Users")); - connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int))); - connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers())); + connect(users, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(users, TQ_SIGNAL(setMinMaxUID(int,int)), TQ_SLOT(slotMinMaxUID(int,int))); + connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(clearUsers()), users, TQ_SLOT(slotClearUsers())); convenience = new TDMConvenienceWidget(this, 0); tab->addTab(convenience, i18n("Con&venience")); - connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers())); + connect(convenience, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(clearUsers()), convenience, TQ_SLOT(slotClearUsers())); load(); if (getuid() != 0 || !config->checkConfigFilesWritable( true )) { @@ -298,7 +298,7 @@ void TDModule::propagateUsers() groupmap.clear(); emit clearUsers(); TQMap<TQString,int> lusers; - TQMapConstIterator<TQString, QPair<int,TQStringList> > it; + TQMapConstIterator<TQString, TQPair<int,TQStringList> > it; TQStringList::ConstIterator jt; TQMap<TQString,int>::Iterator gmapi; for (it = usermap.begin(); it != usermap.end(); ++it) { @@ -321,7 +321,7 @@ void TDModule::slotMinMaxUID(int min, int max) { if (updateOK) { TQMap<TQString,int> alusers, dlusers; - TQMapConstIterator<TQString, QPair<int,TQStringList> > it; + TQMapConstIterator<TQString, TQPair<int,TQStringList> > it; TQStringList::ConstIterator jt; TQMap<TQString,int>::Iterator gmapi; for (it = usermap.begin(); it != usermap.end(); ++it) { diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h index 48cfa5b22..4274e8323 100644 --- a/kcontrol/tdm/main.h +++ b/kcontrol/tdm/main.h @@ -38,7 +38,7 @@ class KBackground; class TDModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -71,7 +71,7 @@ private: TDMUsersWidget *users; TDMConvenienceWidget *convenience; - TQMap<TQString, QPair<int,TQStringList> > usermap; + TQMap<TQString, TQPair<int,TQStringList> > usermap; TQMap<TQString,int> groupmap; int minshowuid, maxshowuid; bool updateOK; diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 8e49087d1..973d1dc35 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -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); @@ -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); diff --git a/kcontrol/tdm/tdm-appear.h b/kcontrol/tdm/tdm-appear.h index 69c2b241b..d79ac0524 100644 --- a/kcontrol/tdm/tdm-appear.h +++ b/kcontrol/tdm/tdm-appear.h @@ -44,7 +44,7 @@ class KLineEdit; class TDMAppearanceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMAppearanceWidget(TQWidget *parent, const char *name=0); diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp index 487e8adbb..a324e866a 100644 --- a/kcontrol/tdm/tdm-conv.cpp +++ b/kcontrol/tdm/tdm-conv.cpp @@ -55,7 +55,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to TDM's graphical login." " Think twice before enabling this!") ); - connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(alGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); TQWidget *hlpw1 = new TQWidget( alGroup ); userlb = new KComboBox( hlpw1 ); @@ -64,7 +64,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) hlpl1->setColStretch(2, 1); hlpl1->addWidget(u_label, 0, 0); hlpl1->addWidget(userlb, 0, 1); - connect(userlb, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotChanged())); + connect(userlb, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotChanged())); wtstr = i18n("Select the user to be logged in automatically."); TQWhatsThis::add( u_label, wtstr ); TQWhatsThis::add( userlb, wtstr ); @@ -74,18 +74,18 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) d_label = new TQLabel( delaysb, i18n("D&elay:"), hlpw1 ); hlpl1->addWidget(d_label, 1, 0); hlpl1->addWidget(delaysb, 1, 1); - connect(delaysb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(delaysb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); wtstr = i18n("The delay (in seconds) before the automatic login kicks in. " "This feature is also known as \"timed login\"."); TQWhatsThis::add( d_label, wtstr ); TQWhatsThis::add( delaysb, wtstr ); againcb = new TQCheckBox( i18n("P&ersistent"), alGroup ); - connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + connect( againcb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only " "when TDM starts up. If this is checked, automatic login will kick in " "after finishing a session as well.") ); autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup ); - connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + connect( autoLockCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session " "will be locked immediately (provided it is a TDE session). This can " "be used to obtain a super-fast login restricted to one user.") ); @@ -94,8 +94,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); puGroup->setSizePolicy( vpref ); - connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); - connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); + connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPresChanged())); + connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotChanged())); npRadio = new TQRadioButton(i18n("preselected user", "&None"), puGroup); ppRadio = new TQRadioButton(i18n("Prev&ious"), puGroup); TQWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. " @@ -106,7 +106,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) TQWidget *hlpw = new TQWidget(puGroup); puserlb = new KComboBox(true, hlpw); pu_label = new TQLabel(puserlb, i18n("Us&er:"), hlpw); - connect(puserlb, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(puserlb, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); wtstr = i18n("Select the user to be preselected for login. " "This box is editable, so you can specify an arbitrary non-existent " "user to mislead possible attackers."); @@ -121,7 +121,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) "in the password field instead of the user field after preselecting a user. " "Use this to save one key press per login, if the preselection usually does not need to " "be changed.") ); - connect(cbjumppw, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(cbjumppw, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); npGroup = new TQVGroupBox(i18n("Enable Password-&Less Logins"), this ); npGroup->setCheckable( true ); @@ -131,7 +131,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) " password. This applies only to TDM's graphical login." " Think twice before enabling this!") ); - connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(npGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup); npuserlv = new TDEListView(npGroup); @@ -141,8 +141,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) npuserlv->setResizeMode(TQListView::LastColumn); TQWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for." " Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.")); - connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); btGroup = new TQVGroupBox( i18n("Miscellaneous"), this ); @@ -152,12 +152,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) " X server crash; note that this can open a security hole: if you use" " a screen locker than TDE's integrated one, this will make" " circumventing a password-secured screen lock possible.") ); - connect(cbarlen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(cbarlen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); allowRootLogin = new TQCheckBox(i18n("Allow &Root Login"), btGroup); TQWhatsThis::add( allowRootLogin, i18n("When set this allows root logins directly in TDM. " "This is discouraged by some people. Use with caution.") ); - connect(allowRootLogin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(allowRootLogin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); TQGridLayout *main = new TQGridLayout(this, 5, 2, 10); main->addWidget(paranoia, 0, 0); @@ -169,12 +169,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) main->setColStretch(1, 2); main->setRowStretch(3, 1); - connect( userlb, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotSetAutoUser( const TQString & )) ); - connect( puserlb, TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotSetPreselUser( const TQString & )) ); - connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateNoPassUser( TQListViewItem * )) ); + connect( userlb, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotSetAutoUser( const TQString & )) ); + connect( puserlb, TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotSetPreselUser( const TQString & )) ); + connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateNoPassUser( TQListViewItem * )) ); } diff --git a/kcontrol/tdm/tdm-conv.h b/kcontrol/tdm/tdm-conv.h index 39e0e30f9..f6d9346b6 100644 --- a/kcontrol/tdm/tdm-conv.h +++ b/kcontrol/tdm/tdm-conv.h @@ -41,7 +41,7 @@ class TDMConvenienceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMConvenienceWidget(TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp index 65dbea179..0aa2e4a70 100644 --- a/kcontrol/tdm/tdm-font.cpp +++ b/kcontrol/tdm/tdm-font.cpp @@ -47,7 +47,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) stdFontChooser = new TDEFontRequester(this); label->setBuddy(stdFontChooser); TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") ); - connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(stdFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 1, 0); ml->addWidget(stdFontChooser, 1, 1); @@ -55,7 +55,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) failFontChooser = new TDEFontRequester(this); label->setBuddy(failFontChooser); TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") ); - connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(failFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 2, 0); ml->addWidget(failFontChooser, 2, 1); @@ -63,14 +63,14 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) greetingFontChooser = new TDEFontRequester(this); label->setBuddy(greetingFontChooser); TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") ); - connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(greetingFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 3, 0); ml->addWidget(greetingFontChooser, 3, 1); aacb = new TQCheckBox (i18n("Use anti-aliasing for fonts"), this); TQWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, " "fonts will be antialiased (smoothed) in the login dialog.") ); - connect(aacb, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(configChanged())); + connect(aacb, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(configChanged())); ml->addMultiCellWidget(aacb, 4, 4, 0, 1); ml->setRowStretch(5, 10); } diff --git a/kcontrol/tdm/tdm-font.h b/kcontrol/tdm/tdm-font.h index fbbbc5028..2d4cb4e62 100644 --- a/kcontrol/tdm/tdm-font.h +++ b/kcontrol/tdm/tdm-font.h @@ -27,7 +27,7 @@ class TQCheckBox; class TDMFontWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMFontWidget(TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp index 14e681d18..6d6ed8cd7 100644 --- a/kcontrol/tdm/tdm-shut.cpp +++ b/kcontrol/tdm/tdm-shut.cpp @@ -17,6 +17,8 @@ Boston, MA 02110-1301, USA. */ +#include "config.h" + #include <unistd.h> #include <sys/types.h> @@ -52,13 +54,13 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) sdlcombo->insertItem(i18n("Everybody"), SdAll); sdlcombo->insertItem(i18n("Only Root"), SdRoot); sdlcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdlcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(sdlcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); sdrcombo = new TQComboBox( FALSE, group0 ); sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0); sdrcombo->insertItem(i18n("Everybody"), SdAll); sdrcombo->insertItem(i18n("Only Root"), SdRoot); sdrcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(sdrcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown" " the computer using TDM. You can specify different values for local (console) and remote displays. " "Possible values are:<ul>" @@ -71,16 +73,16 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) shutdown_lined = new KURLRequester(group1); TQLabel *shutdown_label = new TQLabel(shutdown_lined, i18n("H&alt:"), group1); - connect(shutdown_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(shutdown_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt"); TQWhatsThis::add( shutdown_label, wtstr ); TQWhatsThis::add( shutdown_lined, wtstr ); restart_lined = new KURLRequester(group1); TQLabel *restart_label = new TQLabel(restart_lined, i18n("Reb&oot:"), group1); - connect(restart_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(restart_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot"); TQWhatsThis::add( restart_label, wtstr ); TQWhatsThis::add( restart_lined, wtstr ); @@ -91,17 +93,17 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) bm_combo = new KBackedComboBox( group4 ); bm_combo->insertItem("None", i18n("boot manager", "None")); bm_combo->insertItem("Grub", i18n("Grub")); -#if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) ) +#if defined(Q_OS_LINUX) && ( defined(__i386__) || defined(__amd64__) ) bm_combo->insertItem("Lilo", i18n("Lilo")); #endif TQLabel *bm_label = new TQLabel( bm_combo, i18n("Boot manager:"), group4 ); - connect(bm_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(bm_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog."); TQWhatsThis::add( bm_label, wtstr ); TQWhatsThis::add( bm_combo, wtstr ); tsbox = new TQCheckBox( i18n("Restart X-Server with session exit"), this ); - connect( tsbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( tsbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); wtstr = i18n("Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this option when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues or artifacts."); TQWhatsThis::add( tsbox, wtstr ); @@ -208,12 +210,8 @@ void TDMSessionsWidget::load() readSD(sdrcombo, "Root"); config->setGroup("Shutdown"); - restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot")); -#if defined(__OpenBSD__) - shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt -p")); -#else - shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff")); -#endif + restart_lined->setURL(config->readEntry("RebootCmd", REBOOT_BINARY)); + shutdown_lined->setURL(config->readEntry("HaltCmd", POWEROFF_BINARY)); bm_combo->setCurrentId(config->readEntry("BootManager", "None")); } @@ -222,8 +220,8 @@ void TDMSessionsWidget::load() void TDMSessionsWidget::defaults() { - restart_lined->setURL("/sbin/reboot"); - shutdown_lined->setURL("/sbin/poweroff"); + restart_lined->setURL(REBOOT_BINARY); + shutdown_lined->setURL(POWEROFF_BINARY); sdlcombo->setCurrentItem(SdAll); sdrcombo->setCurrentItem(SdRoot); diff --git a/kcontrol/tdm/tdm-shut.h b/kcontrol/tdm/tdm-shut.h index a8d22adc2..73e1f716f 100644 --- a/kcontrol/tdm/tdm-shut.h +++ b/kcontrol/tdm/tdm-shut.h @@ -30,7 +30,7 @@ class KBackedComboBox; class TDMSessionsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMSessionsWidget(TQWidget *parent=0, const char *name=0); diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index fe2f31c65..5195c3bfd 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -48,7 +48,7 @@ extern KSimpleConfig *config; TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { -#ifdef __linux__ +#ifdef Q_OS_LINUX struct stat st; if (!stat( "/etc/debian_version", &st )) { /* debian */ defminuid = "1000"; @@ -66,10 +66,18 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) defminuid = "500"; defmaxuid = "65000"; } -#else +#elif defined(Q_OS_SOLARIS) + struct stat st; + if (stat( "/etc/dilos_version_build", &st ) == 0) { /* DilOS */ + defminuid = "1000"; + } else { /* other illumos distro */ + defminuid = "100"; + } + defmaxuid = "60000"; +#else /* default */ defminuid = "1000"; defmaxuid = "65000"; -#endif +#endif /* default */ // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users, // and create them if necessary. @@ -85,30 +93,30 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) TQString wtstr; - minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this ); + minGroup = new TQGroupBox( 2, TQt::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 TDM 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, TQT_TQOBJECT(minGroup) ); + TQValidator *valid = new TQIntValidator( 0, 999999, minGroup ); TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); 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()) ); + connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) ); + connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); 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()) ); + connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) ); + connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) ); - usrGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("Users"), this ); - connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) ); - connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + usrGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("Users"), this ); + connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotShowOpts()) ); + connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) ); cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup ); TQWhatsThis::add( cbshowlist, i18n("If this option is checked, TDM will show a list of users," " so users can click on their name or image rather than typing in their login.") ); @@ -121,7 +129,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) "If not checked, select only the checked users. " "If checked, select all non-system users, except the checked ones.")); cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup ); - connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) ); + connect( cbusrsrt, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( cbusrsrt, i18n("If this is checked, TDM will alphabetically sort the user list." " Otherwise users are listed in the order they appear in the password file.") ); @@ -132,27 +140,27 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) optinlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optinlv ); - connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) ); - connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateOptIn( TQListViewItem * )) ); + connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); optoutlv = new TDEListView( this ); optoutlv->addColumn( i18n("Hidden Users") ); optoutlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optoutlv ); - connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) ); - connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateOptOut( TQListViewItem * )) ); + connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); - faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this ); + faceGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("User Image Source"), this ); TQWhatsThis::add( faceGroup, i18n("Here you can specify where TDM will obtain the images that represent users." " \"Admin\" represents the global folder; these are the pictures you can set below." " \"User\" means that TDM should read the user's $HOME/.face.icon file." " The two selections in the middle define the order of preference if both sources are available.") ); - connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) ); - connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotFaceOpts()) ); + connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) ); rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup ); rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup ); rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup ); @@ -162,29 +170,29 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) TQWidget *hlpw = new TQWidget( picGroup ); usercombo = new KComboBox( hlpw ); TQWhatsThis::add( usercombo, i18n("The user the image below belongs to.") ); - connect( usercombo, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotUserSelected()) ); + connect( usercombo, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotUserSelected()) ); TQLabel *userlabel = new TQLabel( usercombo, i18n("User:"), hlpw ); userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); - connect( userbutton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotUserButtonClicked()) ); + connect( userbutton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotUserButtonClicked()) ); TQToolTip::add( userbutton, i18n("Click or drop an image here") ); TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list" " of images or drag and drop your own image on to the button (e.g. from Konqueror).") ); rstuserbutton = new TQPushButton( i18n("Unset"), hlpw ); TQWhatsThis::add( rstuserbutton, i18n("Click this button to make TDM use the default image for the selected user.") ); - connect( rstuserbutton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotUnsetUserPix()) ); + connect( rstuserbutton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotUnsetUserPix()) ); TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() ); hlpl->addWidget( userlabel, 0, 0 ); // hlpl->addSpacing( KDialog::spacingHint() ); hlpl->addWidget( usercombo, 0, 1 ); - hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, Qt::AlignHCenter ); - hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, Qt::AlignHCenter ); + hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, TQt::AlignHCenter ); + hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, TQt::AlignHCenter ); TQHBoxLayout *main = new TQHBoxLayout( this, 10 ); @@ -219,7 +227,7 @@ void TDMUsersWidget::makeReadOnly() rbprefusr->setEnabled(false); rbusronly->setEnabled(false); wstack->setEnabled(false); - disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) ); + disconnect( userbutton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUserButtonClicked()) ); userbutton->setAcceptDrops(false); rstuserbutton->setEnabled(false); } @@ -264,7 +272,7 @@ void TDMUsersWidget::slotUserSelected() rstuserbutton->setEnabled( false ); } if (!p.isNull()) { - userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) ); + userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) ); } } @@ -288,7 +296,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix) return; } - p = p.smoothScale( 48, 48, TQ_ScaleMin ); + p = p.smoothScale( 48, 48, TQImage::ScaleMin ); TQString userpix = m_userPixDir + user + ".face.icon"; if (!p.save( userpix, "PNG" )) KMessageBox::sorry(this, diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h index 08c66c6f8..157f29551 100644 --- a/kcontrol/tdm/tdm-users.h +++ b/kcontrol/tdm/tdm-users.h @@ -39,7 +39,7 @@ class TDMUsersWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDMUsersWidget( TQWidget *parent = 0, const char *name = 0 ); |