Changeset 6359

Timestamp:

06/27/2008 04:10:19 PM (12 months ago)

Author:

flynd

Message:

Removed some usage of uin functions in console plugin.

Location:

trunk/console/src

Files:

• console.cpp (modified) (1 diff)
• console_print.cpp (modified) (5 diffs)

trunk/console/src/console.cpp

@@ -3262 +3262 @@
   
   ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
-  winMain->wprintf("%A%CEnter your password for %s (%lu):%C%Z\n", A_BOLD,
-                   COLOR_GREEN, o->GetAlias(), o->Uin(), COLOR_WHITE, A_BOLD);
+  winMain->wprintf("%A%CEnter your password for %s (%s):%C%Z\n", A_BOLD,
+                   COLOR_GREEN, o->GetAlias(), o->IdString(), COLOR_WHITE, A_BOLD);
   gUserManager.DropOwner();
 }

trunk/console/src/console_print.cpp

@@ -169 +169 @@
   if (o)
   {
-    winStatus->wprintf("%C%A[ %C%s %C(%C%ld%C) - S: %C%s %C- G: %C%s %C- M: %C%s %C- L: %C%s %C]", 29,
+    winStatus->wprintf("%C%A[ %C%s %C(%C%s%C) - S: %C%s %C- G: %C%s %C- M: %C%s %C- L: %C%s %C]", 29,
                        A_BOLD, 5,  o->GetAlias(), 29,
-                       5, o->Uin(), 29,
+                       5, o->IdString(), 29,
                        53, o->StatusStr(), 29,
                        53, CurrentGroupName(), 29,
@@ -591 +591 @@
   wattroff(winMain->Win(), A_BOLD);
 
-  winMain->wprintf("%s %A(%Z%ld%A) General Info - %Z%s\n", u->GetAlias(), A_BOLD,
-                   A_BOLD, u->Uin(), A_BOLD, A_BOLD, u->StatusStr());
+  winMain->wprintf("%s %A(%Z%s%A) General Info - %Z%s\n", u->GetAlias(), A_BOLD,
+                   A_BOLD, u->IdString(), A_BOLD, A_BOLD, u->StatusStr());
 
   winMain->wprintf("%C%AName: %Z%s %s\n", COLOR_WHITE, A_BOLD, A_BOLD,
@@ -658 +658 @@
   wattroff(winMain->Win(), A_BOLD);
 
-  winMain->wprintf("%s %A(%Z%ld%A) More Info - %Z%s\n", u->GetAlias(), A_BOLD,
-                   A_BOLD, u->Uin(), A_BOLD, A_BOLD, u->StatusStr());
+  winMain->wprintf("%s %A(%Z%s%A) More Info - %Z%s\n", u->GetAlias(), A_BOLD,
+                   A_BOLD, u->IdString(), A_BOLD, A_BOLD, u->StatusStr());
 
   if (u->GetAge() == AGE_UNSPECIFIED)
@@ -704 +704 @@
   wattroff(winMain->Win(), A_BOLD);
 
-  winMain->wprintf("%s %A(%Z%ld%A) Work Info - %Z%s\n", u->GetAlias(), A_BOLD,
-                   A_BOLD, u->Uin(), A_BOLD, A_BOLD, u->StatusStr());
+  winMain->wprintf("%s %A(%Z%s%A) Work Info - %Z%s\n", u->GetAlias(), A_BOLD,
+                   A_BOLD, u->IdString(), A_BOLD, A_BOLD, u->StatusStr());
 
   winMain->wprintf("%C%ACompany Name: %Z%s\n", COLOR_WHITE, A_BOLD, A_BOLD, u->GetCompanyName());
@@ -754 +754 @@
   wattroff(winMain->Win(), A_BOLD);
 
-  winMain->wprintf("%s %A(%Z%ld%A) About Info - %Z%s\n", u->GetAlias(), A_BOLD,
-                    A_BOLD, u->Uin(), A_BOLD, A_BOLD, u->StatusStr());
+  winMain->wprintf("%s %A(%Z%s%A) About Info - %Z%s\n", u->GetAlias(), A_BOLD,
+                    A_BOLD, u->IdString(), A_BOLD, A_BOLD, u->StatusStr());
 
   winMain->wprintf("%s\n", u->GetAbout());