Changeset 6235 for trunk/qt-gui

Timestamp:

06/05/08 03:25:29 (6 months ago)

Author:

flynd

Message:

Silence warnings from gcc 4.3

Location:

trunk/qt-gui/src

Files:

• chatdlg.cpp (modified) (2 diffs)
• chatjoin.cpp (modified) (1 diff)
• mainwin.cpp (modified) (8 diffs)

trunk/qt-gui/src/chatdlg.cpp

@@ -578 +578 @@
                          iter->u->ColorBg()[2]);
       QFont f(iter->w->font());
-      f.setFixedPitch(iter->u->FontStyle() & 0x0F == STYLE_FIXEDxPITCH);
+      f.setFixedPitch(iter->u->FontStyle() && 0x0F == STYLE_FIXEDxPITCH);
 
       switch (iter->u->FontStyle() & 0xF0)
@@ -847 +847 @@
         {
           QFont f(GetWindow(u)->font());
-          f.setFixedPitch(u->FontStyle() & 0x0F == STYLE_FIXEDxPITCH);
+          f.setFixedPitch(u->FontStyle() && 0x0F == STYLE_FIXEDxPITCH);
 
           switch (u->FontStyle() & 0xF0)

trunk/qt-gui/src/chatjoin.cpp

@@ -123 +123 @@
   for (iter = originalChats.begin();
        iter != originalChats.end() && n < lstChats->currentItem();
-       iter++, n++);
+       iter++, n++)
+    ;
 
   ChatDlg *cd = *iter;

trunk/qt-gui/src/mainwin.cpp

@@ -237 +237 @@
   if((unsigned short) Status != ICQ_STATUS_OFFLINE && (Status & ICQ_STATUS_FxPRIVATE)
      && !gMainWindow->m_bShowExtendedIcons)
+  {
      if (nPPID == MSN_PPID)
        return gMainWindow->pmMSNPrivate;
      else
        return gMainWindow->pmPrivate;
-       
+  }
+
   if ((unsigned short) Status == ICQ_STATUS_OFFLINE)
+  {
     if (nPPID == MSN_PPID)
       return gMainWindow->pmMSNOffline;
@@ -249 +252 @@
     else
       return gMainWindow->pmOffline;
+  }
 
   if (Status & ICQ_STATUS_DND)
+  {
     if (nPPID == MSN_PPID)
       return gMainWindow->pmMSNOccupied;
@@ -257 +262 @@
     else
       return gMainWindow->pmDnd;
+  }
 
   if (Status & ICQ_STATUS_OCCUPIED)
+  {
     if (nPPID == MSN_PPID)
       return gMainWindow->pmMSNOccupied;
@@ -265 +272 @@
     else
       return gMainWindow->pmOccupied;
+  }
 
   if (Status & ICQ_STATUS_NA)
+  {
     if (nPPID == MSN_PPID)
       return gMainWindow->pmMSNAway;
@@ -273 +282 @@
     else
       return gMainWindow->pmNa;
+  }
 
   if (Status & ICQ_STATUS_AWAY)
+  {
     if (nPPID == MSN_PPID)
       return gMainWindow->pmMSNAway;
@@ -281 +292 @@
     else
       return gMainWindow->pmAway;
+  }
 
   if (Status & ICQ_STATUS_FREEFORCHAT) return gMainWindow->pmFFC;
@@ -1019 +1031 @@
     // btnSystem
     if (btnSystem != NULL)
+    {
       if ((skin->btnSys.rect.x1 == skin->btnSys.rect.x2) && (skin->btnSys.rect.y1 == skin->btnSys.rect.y2))
         btnSystem->hide();
       else
         btnSystem->show();
+    }
     // lblStatus
     if (lblStatus != NULL)
+    {
       if ((skin->lblStatus.rect.x1 == skin->lblStatus.rect.x2) && (skin->lblStatus.rect.y1 == skin->lblStatus.rect.y2))
         lblStatus->hide();
       else
         lblStatus->show();
+    }
     // lblMsg
     if (lblMsg != NULL)
+    {
       if ((skin->lblMsg.rect.x1 == skin->lblMsg.rect.x2) && (skin->lblMsg.rect.y1 == skin->lblMsg.rect.y2))
         lblMsg->hide();
       else
         lblMsg->show();
+    }
     // cmbGroups
     if (cmbUserGroups != NULL)
+    {
       if ((skin->cmbGroups.rect.x1 == skin->cmbGroups.rect.x2) && (skin->cmbGroups.rect.y1 == skin->cmbGroups.rect.y2))
         cmbUserGroups->hide();
       else
         cmbUserGroups->show();
+    }
     if (menu != NULL) menu->show();
     updateUserWin();
@@ -1151 +1171 @@
   // cmbUserGroups
   if (cmbUserGroups != NULL)
+  {
     if ((skin->cmbGroups.rect.x1 == skin->cmbGroups.rect.x2) && (skin->cmbGroups.rect.y1 == skin->cmbGroups.rect.y2))
       cmbUserGroups->hide();
     else
       cmbUserGroups->setGeometry(skin->borderToRect(&skin->cmbGroups, this));
+  }
   // lblMsg
   if (lblMsg != NULL)
+  {
     if ((skin->lblMsg.rect.x1 == skin->lblMsg.rect.x2) && (skin->lblMsg.rect.y1 == skin->lblMsg.rect.y2))
       lblMsg->hide();
     else
       lblMsg->setGeometry(skin->borderToRect(&skin->lblMsg, this));
+  }
   // lblStatus
   if (lblStatus != NULL)
+  {
     if ((skin->lblStatus.rect.x1 == skin->lblStatus.rect.x2) && (skin->lblStatus.rect.y1 == skin->lblStatus.rect.y2))
       lblStatus->hide();
     else
       lblStatus->setGeometry(skin->borderToRect(&skin->lblStatus, this));
+  }
   // btnSystem
   if (btnSystem != NULL)
+  {
     if ((skin->btnSys.rect.x1 == skin->btnSys.rect.x2) && (skin->btnSys.rect.y1 == skin->btnSys.rect.y2))
       btnSystem->hide();
     else
       btnSystem->setGeometry(skin->borderToRect(&skin->btnSys, this));
+  }
 }