From 5f444a9ea966b68991cef44d2711378ef9ff406d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:40:58 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kuser/kuser.cpp | 2 +- kuser/kuservw.cpp | 2 +- kuser/propdlg.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kuser') diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp index 4ac7c43..fb4ffdc 100644 --- a/kuser/kuser.cpp +++ b/kuser/kuser.cpp @@ -772,7 +772,7 @@ int KU::KUser::removeCrontabs() file = TQFile::decodeName(CRONTAB_DIR) + "/" + p_name; if ( access(TQFile::encodeName(file), F_OK) == 0 ) { - command = TQString::fromLatin1("crontab -u %1 -r").arg(KProcess::quote(p_name)); + command = TQString::fromLatin1("crontab -u %1 -r").arg(TDEProcess::quote(p_name)); if ( system(TQFile::encodeName(command)) != 0 ) { KMessageBox::error( 0, i18n("Cannot remove crontab %1.\nError: %2") .arg(command).arg(TQString::fromLocal8Bit(strerror(errno))) ); diff --git a/kuser/kuservw.cpp b/kuser/kuservw.cpp index 6059726..b98495e 100644 --- a/kuser/kuservw.cpp +++ b/kuser/kuservw.cpp @@ -51,7 +51,7 @@ void KUserViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, TQColor c = _cg.text(); if ( mUser->getDisabled() ) - _cg.setColor( TQColorGroup::Text, KGlobalSettings::visitedLinkColor() ); + _cg.setColor( TQColorGroup::Text, TDEGlobalSettings::visitedLinkColor() ); KListViewItem::paintCell( p, _cg, column, width, alignment ); diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp index 1a375c5..40e8085 100644 --- a/kuser/propdlg.cpp +++ b/kuser/propdlg.cpp @@ -461,7 +461,7 @@ void propdlg::selectuser() kug->getUsers().getCaps() & KU::KUsers::Cap_Samba || kug->getUsers().getCaps() & KU::KUsers::Cap_BSD ) { - leslstchg->setText( KGlobal::locale()->formatDateTime( datetime, false ) ); + leslstchg->setText( TDEGlobal::locale()->formatDateTime( datetime, false ) ); } if ( one ) { @@ -919,7 +919,7 @@ void propdlg::setpwd() kug->getUsers().getCaps() & KU::KUsers::Cap_Samba || kug->getUsers().getCaps() & KU::KUsers::Cap_BSD ) { - leslstchg->setText( KGlobal::locale()->formatDateTime( datetime, false ) ); + leslstchg->setText( TDEGlobal::locale()->formatDateTime( datetime, false ) ); } cbdisabled->setChecked( false ); } -- cgit v1.2.3