diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:33 -0600 |
| commit | 604bf3f969d880708ea9a1affce0b304c29e6ff5 (patch) | |
| tree | e8fad7142f5d23041b1c9e6c2a1d0d8c814b0ebe /libktorrent/interfaces | |
| parent | 93f5eb31173901d14b4376614f89d43973ddd45b (diff) | |
| download | ktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.tar.gz ktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libktorrent/interfaces')
| -rw-r--r-- | libktorrent/interfaces/filetreediritem.cpp | 4 | ||||
| -rw-r--r-- | libktorrent/interfaces/functions.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp index 93db727..cc199ce 100644 --- a/libktorrent/interfaces/filetreediritem.cpp +++ b/libktorrent/interfaces/filetreediritem.cpp @@ -39,7 +39,7 @@ namespace kt { parent = 0; size = 0; - setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setText(0,name); setText(1,BytesToString(size)); setText(2,i18n("Yes")); @@ -53,7 +53,7 @@ namespace kt name(name),parent(parent) { size = 0; - setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setText(0,name); setText(1,BytesToString(size)); setText(2,i18n("Yes")); diff --git a/libktorrent/interfaces/functions.cpp b/libktorrent/interfaces/functions.cpp index 6a19d7f..630e32a 100644 --- a/libktorrent/interfaces/functions.cpp +++ b/libktorrent/interfaces/functions.cpp @@ -30,7 +30,7 @@ namespace kt TQString BytesToString(Uint64 bytes,int precision) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); if (bytes >= 1024 * 1024 * 1024) return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision)); else if (bytes >= 1024*1024) @@ -43,13 +43,13 @@ namespace kt TQString KBytesPerSecToString(double speed,int precision) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision)); } TQString DurationToString(Uint32 nsecs) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); TQTime t; int ndays = nsecs / 86400; t = t.addSecs(nsecs % 86400); |