Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent bafe0518ae
commit 5cd0f61d88

@ -319,7 +319,7 @@ KCleanup::expandVariables( const KFileInfo * item,
if ( KDE::versionMajor() >= 3 && KDE::versionMinor() >= 4 )
expanded.replace( TQRegExp( "%t" ), "trash:/" );
else
expanded.replace( TQRegExp( "%t" ), KGlobalSettings::trashPath() );
expanded.replace( TQRegExp( "%t" ), TDEGlobalSettings::trashPath() );
return expanded;
}
@ -329,7 +329,7 @@ void
KCleanup::runCommand ( const KFileInfo * item,
const TQString & command ) const
{
KProcess proc;
TDEProcess proc;
KDirSaver dir( itemDir( item ) );
TQString cmd( expandVariables( item, command ));
@ -356,7 +356,7 @@ KCleanup::runCommand ( const KFileInfo * item,
// finish, so we are starting the command as a pure
// background process.
proc.start( KProcess::DontCare );
proc.start( TDEProcess::DontCare );
break;
@ -369,7 +369,7 @@ KCleanup::runCommand ( const KFileInfo * item,
// process in blocking mode.
TQApplication::setOverrideCursor( waitCursor );
proc.start( KProcess::Block );
proc.start( TDEProcess::Block );
TQApplication::restoreOverrideCursor();
break;
}

@ -88,7 +88,7 @@ KDirTreeView::KDirTreeView( TQWidget * parent )
setSorting( _totalSizeCol );
#define loadIcon(ICON) KGlobal::iconLoader()->loadIcon( (ICON), KIcon::Small )
#define loadIcon(ICON) TDEGlobal::iconLoader()->loadIcon( (ICON), KIcon::Small )
_openDirIcon = loadIcon( "folder_open" );
_closedDirIcon = loadIcon( "folder" );
@ -734,7 +734,7 @@ KDirTreeView::ensureContrast()
void
KDirTreeView::paletteChanged()
{
setTreeBackground( KGlobalSettings::baseColor() );
setTreeBackground( TDEGlobalSettings::baseColor() );
ensureContrast();
}
@ -1764,7 +1764,7 @@ KDirStat::formatSizeLong( KFileSize size )
if ( ++count == 3 && size > 0 )
{
sizeText = KGlobal::locale()->thousandsSeparator() + sizeText;
sizeText = TDEGlobal::locale()->thousandsSeparator() + sizeText;
count = 0;
}
}
@ -1912,8 +1912,8 @@ KDirStat::localeTimeDate( time_t rawTime )
TQDateTime timeDate;
timeDate.setTime_t( rawTime );
TQString timeDateString =
KGlobal::locale()->formatDate( timeDate.date(), true ) + " " + // short format
KGlobal::locale()->formatTime( timeDate.time(), true ); // include seconds
TDEGlobal::locale()->formatDate( timeDate.date(), true ) + " " + // short format
TDEGlobal::locale()->formatTime( timeDate.time(), true ); // include seconds
return timeDateString;
}

@ -116,7 +116,7 @@ KFeedbackForm::KFeedbackForm( const TQString & feedbackMailAddress,
label = new TQLabel( hbox );
CHECK_PTR( label );
label->setPixmap( KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
label->setSizePolicy( pol );
label = new TQLabel( i18n( " must be answered before a mail can be sent.") , hbox );
@ -154,7 +154,7 @@ KFeedbackForm::sendMail()
TQString subject;
const TDEAboutData * aboutData = KGlobal::instance()->aboutData();
const TDEAboutData * aboutData = TDEGlobal::instance()->aboutData();
if ( aboutData )
subject = aboutData->programName() + "-" + aboutData->version();
@ -342,7 +342,7 @@ KFeedbackQuestion::KFeedbackQuestion( KFeedbackQuestionList * parent,
{
if ( required )
{
setPixmap( 0, KGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "edit", KIcon::Small ) );
}
setOpen( open );

Loading…
Cancel
Save