gnome-system-monitor r2395 - trunk/src

[bdejean svn gnome org]

Author: bdejean
Date: Mon Apr 21 16:51:22 2008
New Revision: 2395
URL: http://svn.gnome.org/viewvc/gnome-system-monitor?rev=2395&view=rev

Log:
Moving to gio: s/GnomeVFSFileSize/guint64/g.


Modified:
   trunk/src/util.cpp
   trunk/src/util.h

Modified: trunk/src/util.cpp
==============================================================================
--- trunk/src/util.cpp	(original)
+++ trunk/src/util.cpp	Mon Apr 21 16:51:22 2008
@@ -153,21 +153,21 @@
  **/
 
 gchar*
-procman::format_size(GnomeVFSFileSize size, GnomeVFSFileSize max_size)
+procman::format_size(guint64 size, guint64 max_size)
 {
 	if (max_size == 0)
 		max_size = size;
 
-	if (max_size < (GnomeVFSFileSize) KIBIBYTE_FACTOR) {
+	if (max_size < (guint64) KIBIBYTE_FACTOR) {
 		return g_strdup_printf (dngettext(GETTEXT_PACKAGE, "%u byte", "%u bytes",(guint) size), (guint) size);
 	} else {
 		guint factor;
 		const char* format;
 
-		if (max_size < (GnomeVFSFileSize) MEBIBYTE_FACTOR) {
+		if (max_size < (guint64) MEBIBYTE_FACTOR) {
 		  factor = KIBIBYTE_FACTOR;
 		  format = N_("%.1f KiB");
-		} else if (max_size < (GnomeVFSFileSize) GIBIBYTE_FACTOR) {
+		} else if (max_size < (guint64) GIBIBYTE_FACTOR) {
 		  factor = MEBIBYTE_FACTOR;
 		  format = N_("%.1f MiB");
 		} else {
@@ -459,7 +459,7 @@
 
 
 
-  std::string format_rate(GnomeVFSFileSize rate, GnomeVFSFileSize max_rate)
+  std::string format_rate(guint64 rate, guint64 max_rate)
   {
     char* bytes = procman::format_size(rate, max_rate);
     // xgettext: rate, 10MiB/s

Modified: trunk/src/util.h
==============================================================================
--- trunk/src/util.h	(original)
+++ trunk/src/util.h	Mon Apr 21 16:51:22 2008
@@ -135,9 +135,9 @@
   }
 
 
-  gchar* format_size(GnomeVFSFileSize size, GnomeVFSFileSize max = 0);
+  gchar* format_size(guint64 size, guint64 max = 0);
 
-  std::string format_rate(GnomeVFSFileSize rate, GnomeVFSFileSize max_rate = 0);
+  std::string format_rate(guint64 rate, guint64 max_rate = 0);
 }