Changeset 6176 for trunk/console

Timestamp:

04/30/08 05:12:52 (7 months ago)

Author:

flynd

Message:

Fixed some compiler warnings. Some unused variables and a few ugly casts to workaround that CDK lib parameters aren't defined as const when they should be.

Location:

trunk/console/src

Files:

• console.cpp (modified) (3 diffs)
• console.h (modified) (1 diff)
• console_menu.cpp (modified) (3 diffs)
• console_print.cpp (modified) (5 diffs)
• window.cpp (modified) (1 diff)
• window.h (modified) (1 diff)

trunk/console/src/console.cpp

@@ -128 +128 @@
  * CLicqConsole::Constructor
  *-------------------------------------------------------------------------*/
-CLicqConsole::CLicqConsole(int argc, char **argv)
+CLicqConsole::CLicqConsole(int /* argc */, char** /* argv */)
 {
   CWindow::StartScreen();
@@ -990 +990 @@
       win->wprintf("%A%CSearch complete.\n", m_cColorInfo->nAttr, m_cColorInfo->nColor);
     }
-    else if (e->SearchAck()->More() == -1)
+    else if (static_cast<long>(e->SearchAck()->More()) == -1)
     {
       win->wprintf("%A%CSearch complete.  More users found, narrow search.\n",
@@ -2112 +2112 @@
  * CLicqConsole::UserCommand_SetAutoResponse
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserCommand_SetAutoResponse(const char *szId, unsigned long nPPID, char *)
+void CLicqConsole::UserCommand_SetAutoResponse(const char* /* szId */, unsigned long /* nPPID */, char *)
 {
   // First put this console into edit mode

trunk/console/src/console.h

@@ -222 +222 @@
 struct SCommand
 {
-  char *szName;
+  const char* szName;
   void (CLicqConsole::*fProcessCommand)(char *);
   void (CLicqConsole::*fProcessTab)(char *, struct STabCompletion &);
-  char *szHelp;
-  char *szDescription;
+  const char* szHelp;
+  const char* szDescription;
 };
 extern const unsigned short NUM_COMMANDS;

trunk/console/src/console_menu.cpp

@@ -111 +111 @@
  * Callback function for when SPACE is pressed on the cdkUserList
  *-------------------------------------------------------------------------*/
-int CLicqConsole::MenuPopupWrapper(EObjectType cdktype, void *object, void *clientData, chtype key)
+int CLicqConsole::MenuPopupWrapper(EObjectType /* cdktype */, void* /* object */, void* clientData, chtype /* key */)
 {
   CLicqConsole *me = (CLicqConsole *)clientData;
@@ -178 +178 @@
  * CLicqConsole::MenuList
  *-------------------------------------------------------------------------*/
-void CLicqConsole::MenuList(char *_szArg)
+void CLicqConsole::MenuList(char* /* _szArg */)
 {
   int userSelected;
@@ -255 +255 @@
  * CLicqConsole::MenuPlugins
  *-------------------------------------------------------------------------*/
-void CLicqConsole::MenuPlugins(char *_szArg)
+void CLicqConsole::MenuPlugins(char* /* _szArg */)
 {
   PluginsList l;

trunk/console/src/console_print.cpp

@@ -373 +373 @@
 void CLicqConsole::PrintUsers()
 {
-  char *title = "<C></B/40>Contacts";
-  char *ulist[1024];
+  const char* title = "<C></B/40>Contacts";
+  const char* ulist[1024];
   int i = 0;
   struct SScrollUser *s = NULL;
@@ -403 +403 @@
   {
     cdkUserList = newCDKScroll(winUsers->CDKScreen(), 0, 0, 
-                               RIGHT, LINES - 5, USER_WIN_WIDTH, title,
-                               ulist, i, FALSE, A_NORMAL, TRUE, TRUE);
+                               RIGHT, LINES - 5, USER_WIN_WIDTH, const_cast<char*>(title),
+                               const_cast<char**>(ulist), i, FALSE, A_NORMAL, TRUE, TRUE);
   }
   else
   {
-    setCDKScrollItems (cdkUserList, ulist, i, FALSE);
+    setCDKScrollItems (cdkUserList, const_cast<char**>(ulist), i, FALSE);
   }
   
@@ -452 +452 @@
  * CLicqConsole::UserListCallback
  *-------------------------------------------------------------------------*/
-int CLicqConsole::UserListCallback(EObjectType cdktype, void *object, void *clientData, chtype input)
+int CLicqConsole::UserListCallback(EObjectType /* cdktype */, void* /* object */, void *clientData, chtype input)
 {
   CLicqConsole *me = (CLicqConsole *)clientData; 
@@ -466 +466 @@
   char title[256];
   snprintf(title, 256, "<C></B/40>%s", _szAlias);
-  char *list[10000];
+  const char* list[10000];
   int i = 0;
 
@@ -474 +474 @@
   cdkContactPopup = newCDKScroll(winMain->CDKScreen(), 0, 0,
                                  RIGHT, 10, 20, title,
-                                 list, i, FALSE, A_REVERSE, TRUE, TRUE);
-
-  setCDKScrollBackgroundColor(cdkContactPopup, "</40>");
+                                 const_cast<char**>(list), i, FALSE, A_REVERSE, TRUE, TRUE);
+
+  setCDKScrollBackgroundColor(cdkContactPopup, const_cast<char*>("</40>"));
   drawCDKScroll(cdkContactPopup, true);
   winMain->RefreshWin();

trunk/console/src/window.cpp

@@ -169 +169 @@
 }
 
-void CWindow::wprintf(char *formatIn, ...)
+void CWindow::wprintf(const char *formatIn, ...)
 {
    va_list argp;

trunk/console/src/window.h

@@ -57 +57 @@
   CWindow& operator<<(unsigned long d);
   CWindow& operator<<(unsigned short d);
-  void wprintf(char *formatIn, ...);
+  void wprintf(const char *formatIn, ...);
   WINDOW *Win()  { return win; }
   CDKSCREEN *CDKScreen() { return cdkscreen; }