From 604bf3f969d880708ea9a1affce0b304c29e6ff5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:25:33 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- estimation-scripts/enable-logging.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'estimation-scripts') 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(); + + + -- cgit v1.2.1