diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:21 -0600 |
commit | 5cd0f61d88ee0aa08b9a5cbdb84456019d225617 (patch) | |
tree | b7320d69d1fc7c0542c70877f1f303a21b484196 /kdirstat/kdirtreeview.cpp | |
parent | bafe0518aecc1d6946be9ac55ec41a8438223fff (diff) | |
download | kdirstat-5cd0f61d88ee0aa08b9a5cbdb84456019d225617.tar.gz kdirstat-5cd0f61d88ee0aa08b9a5cbdb84456019d225617.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdirstat/kdirtreeview.cpp')
-rw-r--r-- | kdirstat/kdirtreeview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kdirstat/kdirtreeview.cpp b/kdirstat/kdirtreeview.cpp index a042d2d..f0cea2e 100644 --- a/kdirstat/kdirtreeview.cpp +++ b/kdirstat/kdirtreeview.cpp @@ -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; } |