summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:05:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 08:05:37 -0600
commit95fa1b2e1f05fa546f5846267044032bcdb92493 (patch)
tree220464c1b4b2b3302c78e26a4c71652675362e94
parent7b0ae78a46b9be7342c9366e99c8956a61395733 (diff)
downloadktorrent-95fa1b2e1f05fa546f5846267044032bcdb92493.tar.gz
ktorrent-95fa1b2e1f05fa546f5846267044032bcdb92493.zip
Rename KLocale to enhance compatibility with KDE4
-rw-r--r--apps/ktorrent/trayicon.cpp6
-rw-r--r--estimation-scripts/enable-logging.diff4
-rw-r--r--libktorrent/interfaces/functions.cpp6
-rw-r--r--plugins/infowidget/fileview.cpp2
-rw-r--r--plugins/infowidget/iwfiletreeitem.cpp2
-rw-r--r--plugins/infowidget/localefloatvalidator.h2
-rw-r--r--plugins/infowidget/peerview.cpp2
-rw-r--r--plugins/webinterface/php_interface.cpp4
8 files changed, 14 insertions, 14 deletions
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index de633c4..05b9817 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -159,7 +159,7 @@ void TrayIcon::maxShareRatioReached(kt::TorrentInterface* tc)
return;
const TorrentStats & s = tc->getStats();
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
double speed_up = (double)s.bytes_uploaded / 1024.0;
TQString msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and has been stopped."
@@ -178,7 +178,7 @@ void TrayIcon::maxSeedTimeReached(kt::TorrentInterface* tc)
return;
const TorrentStats & s = tc->getStats();
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
double speed_up = (double)s.bytes_uploaded / 1024.0;
TQString msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and has been stopped."
@@ -223,7 +223,7 @@ void TrayIcon::queuingNotPossible(kt::TorrentInterface* tc)
const TorrentStats & s = tc->getStats();
TQString msg;
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
if (tc->overMaxRatio())
msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.")
diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff
index 4cbd6a9..2c033e7 100644
--- a/estimation-scripts/enable-logging.diff
+++ b/estimation-scripts/enable-logging.diff
@@ -36,7 +36,7 @@ Index: estimation-scripts/enable-logging.diff
-@@ -114,8 +119,43 @@
- setText(6,KBytesPerSecToString(tc->getUploadRate() / 1024.0));
-
-- KLocale* loc = TDEGlobal::locale();
+- TDELocale* loc = TDEGlobal::locale();
-+
-+
-+ if(counter==1)
@@ -145,7 +145,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
@@ -114,8 +121,46 @@
setText(6,KBytesPerSecToString(s.upload_rate / 1024.0));
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
+
+
+
diff --git a/libktorrent/interfaces/functions.cpp b/libktorrent/interfaces/functions.cpp
index 630e32a..709b647 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 = TDEGlobal::locale();
+ TDELocale* 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 = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
}
TQString DurationToString(Uint32 nsecs)
{
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
TQTime t;
int ndays = nsecs / 86400;
t = t.addSecs(nsecs % 86400);
diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp
index 22a79ce..25d910b 100644
--- a/plugins/infowidget/fileview.cpp
+++ b/plugins/infowidget/fileview.cpp
@@ -185,7 +185,7 @@ namespace kt
percent = 0.0;
else if (percent > 100.0)
percent = 100.0;
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
it.current()->setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
}
}
diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/plugins/infowidget/iwfiletreeitem.cpp
index af976ca..d4837dd 100644
--- a/plugins/infowidget/iwfiletreeitem.cpp
+++ b/plugins/infowidget/iwfiletreeitem.cpp
@@ -91,7 +91,7 @@ namespace kt
percent = 0.0;
else if (percent > 100.0)
percent = 100.0;
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
perc_complete = percent;
}
diff --git a/plugins/infowidget/localefloatvalidator.h b/plugins/infowidget/localefloatvalidator.h
index d5217ba..a20858f 100644
--- a/plugins/infowidget/localefloatvalidator.h
+++ b/plugins/infowidget/localefloatvalidator.h
@@ -28,7 +28,7 @@ namespace kt{
/**
* @author Jonas Widarsson
*
- * A float validator that respects KLocale::decimalSymbol()
+ * A float validator that respects TDELocale::decimalSymbol()
*/
class LocaleFloatValidator : public TQValidator
{
diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
index ab3b06f..6d163e4 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/plugins/infowidget/peerview.cpp
@@ -155,7 +155,7 @@ namespace kt
void PeerViewItem::update()
{
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
const PeerInterface::Stats & s = peer->getStats();
if (s.download_rate >= 103) // lowest "visible" speed, all below will be 0,0 Kb/s
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index bffc1fc..a4f5f6a 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -46,7 +46,7 @@ namespace kt
TQString BytesToString2(Uint64 bytes,int precision = 2)
{
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
if (bytes >= 1024 * 1024 * 1024)
return TQString("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
else if (bytes >= 1024*1024)
@@ -59,7 +59,7 @@ namespace kt
TQString KBytesPerSecToString2(double speed,int precision = 2)
{
- KLocale* loc = TDEGlobal::locale();
+ TDELocale* loc = TDEGlobal::locale();
return TQString("%1 KB/s").arg(loc->formatNumber(speed,precision));
}