diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kdmlib/kgreet_classic.cpp | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdmlib/kgreet_classic.cpp')
| -rw-r--r-- | kdmlib/kgreet_classic.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index fd2e65bd8..def8882c1 100644 --- a/kdmlib/kgreet_classic.cpp +++ b/kdmlib/kgreet_classic.cpp @@ -71,7 +71,8 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, themer = 0; if (!themer) - layoutItem = grid = new TQGridLayout( 0, 0, 10 ); + grid = new TQGridLayout( 0, 0, 10 ); + layoutItem = TQT_TQLAYOUTITEM(grid); loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; loginEdit = 0; @@ -166,7 +167,7 @@ KClassicGreeter::~KClassicGreeter() delete passwdEdit; return; } - TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator(); + TQLayoutIterator it = TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; @@ -259,7 +260,7 @@ bool // virtual KClassicGreeter::textMessage( const char *text, bool err ) { if (!err && - TQString( text ).find( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) + TQString( text ).tqfind( TQRegExp( "^Changing password for [^ ]+$" ) ) >= 0) return true; return false; } @@ -274,11 +275,11 @@ KClassicGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) exp = 1; else { TQString pr( prompt ); - if (pr.find( TQRegExp( "\\bpassword\\b", false ) ) >= 0) { - if (pr.find( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", + if (pr.tqfind( TQRegExp( "\\bpassword\\b", false ) ) >= 0) { + if (pr.tqfind( TQRegExp( "\\b(re-?(enter|type)|again|confirm|repeat)\\b", false ) ) >= 0) exp = 3; - else if (pr.find( TQRegExp( "\\bnew\\b", false ) ) >= 0) + else if (pr.tqfind( TQRegExp( "\\bnew\\b", false ) ) >= 0) exp = 2; else { // TQRegExp( "\\b(old|current)\\b", false ) is too strict handler->gplugReturnText( "", |