summaryrefslogtreecommitdiffstats
path: root/estimation-scripts
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:25:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:25:33 -0600
commit604bf3f969d880708ea9a1affce0b304c29e6ff5 (patch)
treee8fad7142f5d23041b1c9e6c2a1d0d8c814b0ebe /estimation-scripts
parent93f5eb31173901d14b4376614f89d43973ddd45b (diff)
downloadktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.tar.gz
ktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'estimation-scripts')
-rw-r--r--estimation-scripts/enable-logging.diff4
1 files changed, 2 insertions, 2 deletions
diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff
index 57dc703..4cbd6a9 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 = KGlobal::locale();
+- KLocale* 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 = KGlobal::locale();
+ KLocale* loc = TDEGlobal::locale();
+
+
+