diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /tdmlib/kgreet_winbind.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdmlib/kgreet_winbind.cpp')
| -rw-r--r-- | tdmlib/kgreet_winbind.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp index 85721dd45..fe73ee169 100644 --- a/tdmlib/kgreet_winbind.cpp +++ b/tdmlib/kgreet_winbind.cpp @@ -246,7 +246,7 @@ KWinbindGreeter::loadUsers( const TQStringList &users ) KCompletion *userNamesCompletion = new KCompletion; loginEdit->setCompletionObject( userNamesCompletion ); loginEdit->setAutoDeleteCompletionObject( true ); - loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto ); + loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); slotChangedDomain( defaultDomain ); } @@ -572,10 +572,10 @@ KWinbindGreeter::slotStartDomainList() m_domainLister = new KProcIO; connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList())); - connect(m_domainLister, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotEndDomainList())); + connect(m_domainLister, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotEndDomainList())); (*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains"; - m_domainLister->setComm (KProcess::Stdout); + m_domainLister->setComm (TDEProcess::Stdout); m_domainLister->start(); } @@ -648,13 +648,13 @@ static bool init( const TQString &, sepstr = "\\"; } separator = sepstr[0].latin1(); - KGlobal::locale()->insertCatalogue( "kgreet_winbind" ); + TDEGlobal::locale()->insertCatalogue( "kgreet_winbind" ); return true; } static void done( void ) { - KGlobal::locale()->removeCatalogue( "kgreet_winbind" ); + TDEGlobal::locale()->removeCatalogue( "kgreet_winbind" ); // avoid static deletion problems ... hopefully staticDomains.clear(); defaultDomain = TQString::null; |