From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdmlib/dmctl.cpp | 4 ++-- kdmlib/kgreet_classic.cpp | 10 +++++----- kdmlib/kgreet_pam.cpp | 22 +++++++++++----------- kdmlib/kgreet_pam.h | 4 ++-- kdmlib/kgreet_winbind.cpp | 14 +++++++------- kdmlib/kgreeterplugin.h | 4 ++-- 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'kdmlib') diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp index 58d4f8379..ac52d5353 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 contains the error message + * @li If false and @p ret is non-empty, it tqcontains the error message * from KDM. */ bool @@ -249,7 +249,7 @@ DM::bootOptions( TQStringList &opts, int &defopt, int ¤t ) opts = TQStringList::split( ' ', opts[1] ); for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it) - (*it).replace( "\\s", " " ); + (*it).tqreplace( "\\s", " " ); return true; } diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index fd2e65bd8..bc4bda77e 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; - layoutItem = 0; + tqlayoutItem = 0; if (themer && (!(user_entry = themer->findNode( "user-entry" )) || @@ -71,7 +71,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, themer = 0; if (!themer) - layoutItem = grid = new TQGridLayout( 0, 0, 10 ); + tqlayoutItem = 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 (!layoutItem) { + if (!tqlayoutItem) { delete loginEdit; delete passwdEdit; return; } - TQLayoutIterator it = static_cast(layoutItem)->iterator(); + TQLayoutIterator it = static_cast(tqlayoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); - delete layoutItem; + delete tqlayoutItem; } void // virtual diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp index b43952488..5ac93e074 100644 --- a/kdmlib/kgreet_pam.cpp +++ b/kdmlib/kgreet_pam.cpp @@ -94,12 +94,12 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, debug("KPamGreeter constructed\n"); - m_parentWidget = parent; + m_tqparentWidget = parent; KdmItem *user_entry = 0, *pw_entry = 0; int line = 0; - layoutItem = 0; + tqlayoutItem = 0; if (themer && (!(user_entry = themer->findNode( "user-entry" )) || @@ -109,7 +109,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, m_themer = themer; if (!themer) - layoutItem = new TQGridLayout( 0, 0, 10 ); + tqlayoutItem = new TQGridLayout( 0, 0, 10 ); loginLabel = 0; authLabel.clear(); @@ -205,14 +205,14 @@ KPamGreeter::~KPamGreeter() { debug("KPamGreeter::~KPamGreeter"); abort(); - if (!layoutItem) { + if (!tqlayoutItem) { delete loginEdit; return; } - TQLayoutIterator it = static_cast(layoutItem)->iterator(); + TQLayoutIterator it = static_cast(tqlayoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); - delete layoutItem; + delete tqlayoutItem; 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_parentWidget); + TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_tqparentWidget); 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_parentWidget); + TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_tqparentWidget); getLayoutItem()->addWidget(label, state+1, 0, 0); - debug("added label widget to layout"); + debug("added label widget to tqlayout"); } 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_parentWidget ); + passwdEdit = new KDMPasswordEdit( m_tqparentWidget ); else - passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget); + passwdEdit = new KDMPasswordEdit( echoMode, m_tqparentWidget); 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 f0bea7d02..16dc0d7ea 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(layoutItem); } + TQGridLayout *getLayoutItem() const { return static_cast(tqlayoutItem); } public slots: void slotLoginLostFocus(); @@ -78,7 +78,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { TQLabel *loginLabel; TQValueList authLabel; KLineEdit *loginEdit; - TQWidget* m_parentWidget; + TQWidget* m_tqparentWidget; TQValueList authEdit; KSimpleConfig *stsFile; KdmThemer *m_themer; diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp index 5f6530707..0e188ba3b 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; - layoutItem = 0; + tqlayoutItem = 0; if (themer && (!(user_entry = themer->findNode( "user-entry" )) || @@ -89,7 +89,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, themer = 0; if (!themer) - layoutItem = grid = new TQGridLayout( 0, 0, 10 ); + tqlayoutItem = 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 (!layoutItem) { + if (!tqlayoutItem) { delete loginEdit; delete passwdEdit; delete domainCombo; return; } - TQLayoutIterator it = static_cast(layoutItem)->iterator(); + TQLayoutIterator it = static_cast(tqlayoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); - delete layoutItem; + delete tqlayoutItem; delete m_domainLister; } @@ -593,7 +593,7 @@ KWinbindGreeter::slotEndDomainList() for (TQStringList::const_iterator it = mDomainListing.begin(); it != mDomainListing.end(); ++it) { - if (!domainList.contains(*it)) + if (!domainList.tqcontains(*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.contains("")) + if (!staticDomains.tqcontains("")) staticDomains << ""; defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString(); diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h index 44799a622..c4591e14b 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 layoutItem; } + TQLayoutItem *getLayoutItem() const { return tqlayoutItem; } protected: KGreeterPluginHandler *handler; - TQLayoutItem *layoutItem; + TQLayoutItem *tqlayoutItem; }; struct KDE_EXPORT kgreeterplugin_info { -- cgit v1.2.1