summaryrefslogtreecommitdiffstats
path: root/kdmlib
diff options
context:
space:
mode:
Diffstat (limited to 'kdmlib')
-rw-r--r--kdmlib/dmctl.cpp4
-rw-r--r--kdmlib/kgreet_classic.cpp10
-rw-r--r--kdmlib/kgreet_pam.cpp22
-rw-r--r--kdmlib/kgreet_pam.h4
-rw-r--r--kdmlib/kgreet_winbind.cpp14
-rw-r--r--kdmlib/kgreeterplugin.h4
6 files changed, 29 insertions, 29 deletions
diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp
index ac52d5353..58d4f8379 100644
--- a/kdmlib/dmctl.cpp
+++ b/kdmlib/dmctl.cpp
@@ -121,7 +121,7 @@ DM::exec( const char *cmd )
* @p ret might contain addional results.
* @li If false and @p ret is empty, a communication error occurred
* (most probably KDM is not running).
- * @li If false and @p ret is non-empty, it tqcontains the error message
+ * @li If false and @p ret is non-empty, it contains the error message
* from KDM.
*/
bool
@@ -249,7 +249,7 @@ DM::bootOptions( TQStringList &opts, int &defopt, int &current )
opts = TQStringList::split( ' ', opts[1] );
for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
- (*it).tqreplace( "\\s", " " );
+ (*it).replace( "\\s", " " );
return true;
}
diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp
index bc4bda77e..fd2e65bd8 100644
--- a/kdmlib/kgreet_classic.cpp
+++ b/kdmlib/kgreet_classic.cpp
@@ -63,7 +63,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
TQGridLayout *grid = 0;
int line = 0;
- tqlayoutItem = 0;
+ layoutItem = 0;
if (themer &&
(!(user_entry = themer->findNode( "user-entry" )) ||
@@ -71,7 +71,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
themer = 0;
if (!themer)
- tqlayoutItem = grid = new TQGridLayout( 0, 0, 10 );
+ layoutItem = grid = new TQGridLayout( 0, 0, 10 );
loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
loginEdit = 0;
@@ -161,15 +161,15 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
KClassicGreeter::~KClassicGreeter()
{
abort();
- if (!tqlayoutItem) {
+ if (!layoutItem) {
delete loginEdit;
delete passwdEdit;
return;
}
- TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator();
+ TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
- delete tqlayoutItem;
+ delete layoutItem;
}
void // virtual
diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp
index 5ac93e074..b43952488 100644
--- a/kdmlib/kgreet_pam.cpp
+++ b/kdmlib/kgreet_pam.cpp
@@ -94,12 +94,12 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
debug("KPamGreeter constructed\n");
- m_tqparentWidget = parent;
+ m_parentWidget = parent;
KdmItem *user_entry = 0, *pw_entry = 0;
int line = 0;
- tqlayoutItem = 0;
+ layoutItem = 0;
if (themer &&
(!(user_entry = themer->findNode( "user-entry" )) ||
@@ -109,7 +109,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
m_themer = themer;
if (!themer)
- tqlayoutItem = new TQGridLayout( 0, 0, 10 );
+ layoutItem = new TQGridLayout( 0, 0, 10 );
loginLabel = 0;
authLabel.clear();
@@ -205,14 +205,14 @@ KPamGreeter::~KPamGreeter()
{
debug("KPamGreeter::~KPamGreeter");
abort();
- if (!tqlayoutItem) {
+ if (!layoutItem) {
delete loginEdit;
return;
}
- TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator();
+ TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
- delete tqlayoutItem;
+ delete layoutItem;
debug("destructor finished, good bye");
}
@@ -314,7 +314,7 @@ KPamGreeter::textMessage( const char *text, bool err )
return false;
if (getLayoutItem()) {
- TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_tqparentWidget);
+ TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_parentWidget);
getLayoutItem()->addWidget(label, state+1, 0, 0);
}
@@ -341,9 +341,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
}
else if (state >= authEdit.size()) {
if (getLayoutItem()) {
- TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_tqparentWidget);
+ TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_parentWidget);
getLayoutItem()->addWidget(label, state+1, 0, 0);
- debug("added label widget to tqlayout");
+ debug("added label widget to layout");
}
else if (m_themer) {
debug("themer found!");
@@ -361,9 +361,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
KDMPasswordEdit* passwdEdit;
if (echoMode == -1)
- passwdEdit = new KDMPasswordEdit( m_tqparentWidget );
+ passwdEdit = new KDMPasswordEdit( m_parentWidget );
else
- passwdEdit = new KDMPasswordEdit( echoMode, m_tqparentWidget);
+ passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget);
connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
TQT_SLOT(slotActivity()) );
connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h
index 16dc0d7ea..f0bea7d02 100644
--- a/kdmlib/kgreet_pam.h
+++ b/kdmlib/kgreet_pam.h
@@ -64,7 +64,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
virtual void revive();
virtual void clear();
- TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(tqlayoutItem); }
+ TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(layoutItem); }
public slots:
void slotLoginLostFocus();
@@ -78,7 +78,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
TQLabel *loginLabel;
TQValueList<TQLabel*> authLabel;
KLineEdit *loginEdit;
- TQWidget* m_tqparentWidget;
+ TQWidget* m_parentWidget;
TQValueList<KPasswordEdit*> authEdit;
KSimpleConfig *stsFile;
KdmThemer *m_themer;
diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp
index 0e188ba3b..5f6530707 100644
--- a/kdmlib/kgreet_winbind.cpp
+++ b/kdmlib/kgreet_winbind.cpp
@@ -80,7 +80,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
TQGridLayout *grid = 0;
int line = 0;
- tqlayoutItem = 0;
+ layoutItem = 0;
if (themer &&
(!(user_entry = themer->findNode( "user-entry" )) ||
@@ -89,7 +89,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
themer = 0;
if (!themer)
- tqlayoutItem = grid = new TQGridLayout( 0, 0, 10 );
+ layoutItem = grid = new TQGridLayout( 0, 0, 10 );
domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
domainCombo = 0;
@@ -206,16 +206,16 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
KWinbindGreeter::~KWinbindGreeter()
{
abort();
- if (!tqlayoutItem) {
+ if (!layoutItem) {
delete loginEdit;
delete passwdEdit;
delete domainCombo;
return;
}
- TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator();
+ TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
- delete tqlayoutItem;
+ delete layoutItem;
delete m_domainLister;
}
@@ -593,7 +593,7 @@ KWinbindGreeter::slotEndDomainList()
for (TQStringList::const_iterator it = mDomainListing.begin();
it != mDomainListing.end(); ++it) {
- if (!domainList.tqcontains(*it))
+ if (!domainList.contains(*it))
domainList.append(*it);
}
@@ -625,7 +625,7 @@ static bool init( const TQString &,
{
echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );
- if (!staticDomains.tqcontains("<local>"))
+ if (!staticDomains.contains("<local>"))
staticDomains << "<local>";
defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString();
diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h
index c4591e14b..44799a622 100644
--- a/kdmlib/kgreeterplugin.h
+++ b/kdmlib/kgreeterplugin.h
@@ -280,11 +280,11 @@ public:
* Obtain the TQLayoutItem containg the widget(s) to actually handle the
* conversation. See TQLayout and TQWidgetItem for possible implementations.
*/
- TQLayoutItem *getLayoutItem() const { return tqlayoutItem; }
+ TQLayoutItem *getLayoutItem() const { return layoutItem; }
protected:
KGreeterPluginHandler *handler;
- TQLayoutItem *tqlayoutItem;
+ TQLayoutItem *layoutItem;
};
struct KDE_EXPORT kgreeterplugin_info {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 13:46:43 +0000