summaryrefslogtreecommitdiffstats
path: root/tdmlib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /tdmlib
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdmlib')
-rw-r--r--tdmlib/kgreet_classic.cpp6
-rw-r--r--tdmlib/kgreet_pam.cpp6
-rw-r--r--tdmlib/kgreet_winbind.cpp10
3 files changed, 11 insertions, 11 deletions
diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp
index b37f2bab..01bf4148 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -180,7 +180,7 @@ KClassicGreeter::loadUsers( const TQStringList &users )
userNamesCompletion->setItems( users );
loginEdit->setCompletionObject( userNamesCompletion );
loginEdit->setAutoDeleteCompletionObject( true );
- loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
+ loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
}
void // virtual
@@ -485,13 +485,13 @@ static bool init( const TQString &,
void *ctx )
{
echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
- KGlobal::locale()->insertCatalogue( "kgreet_classic" );
+ TDEGlobal::locale()->insertCatalogue( "kgreet_classic" );
return true;
}
static void done( void )
{
- KGlobal::locale()->removeCatalogue( "kgreet_classic" );
+ TDEGlobal::locale()->removeCatalogue( "kgreet_classic" );
}
static KGreeterPlugin *
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index 8e294618..d47fc5b5 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -223,7 +223,7 @@ KPamGreeter::loadUsers( const TQStringList &users )
userNamesCompletion->setItems( users );
loginEdit->setCompletionObject( userNamesCompletion );
loginEdit->setAutoDeleteCompletionObject( true );
- loginEdit->setCompletionMode( KGlobalSettings::CompletionAuto );
+ loginEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
}
void // virtual
@@ -643,13 +643,13 @@ static bool init( const TQString &,
void *ctx )
{
echoMode = (KPasswordEdit::EchoModes) getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
- KGlobal::locale()->insertCatalogue( "kgreet_pam" );
+ TDEGlobal::locale()->insertCatalogue( "kgreet_pam" );
return true;
}
static void done( void )
{
- KGlobal::locale()->removeCatalogue( "kgreet_pam" );
+ TDEGlobal::locale()->removeCatalogue( "kgreet_pam" );
if (log && log != stderr)
fclose(log);
log = 0;
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index 85721dd4..fe73ee16 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;