From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdmlib/kgreet_pam.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kdmlib/kgreet_pam.cpp') 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(tqlayoutItem)->iterator(); + TQLayoutIterator it = static_cast(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()) ); -- cgit v1.2.1