Changeset 4466

Show
Ignore:
Timestamp:
07/01/06 10:22:40 (2 years ago)
Author:
emostar
Message:

Change some fuctions to compile with Qt 3.0
Closes #794

Location:
trunk/qt-gui/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/qt-gui/src/mainwin.cpp

    r4457 r4466  
    47154715   
    47164716  // The send submenu and misc modes submenu that depend on sending capabilities 
    4717   mnuUser->setItemVisible(mnuUserSendMsg, nSendFuncs & PP_SEND_MSG); 
    4718   mnuUser->setItemVisible(mnuUserSendUrl, nSendFuncs & PP_SEND_URL); 
    4719   mnuUser->setItemVisible(mnuUserSendFile, nSendFuncs & PP_SEND_FILE); 
    4720   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(4), nSendFuncs & PP_SEND_FILE); 
    4721   mnuUser->setItemVisible(mnuUserSendChat, nSendFuncs & PP_SEND_CHAT); 
    4722   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(5), nSendFuncs & PP_SEND_CHAT); 
    4723   mnuUser->setItemVisible(mnuUserSendContact, nSendFuncs & PP_SEND_CONTACT); 
    4724   mnuUser->setItemVisible(mnuUserAuthorize, nSendFuncs & PP_SEND_AUTH); 
    4725   mnuUser->setItemVisible(mnuUserAuthorizeRequest, nSendFuncs & PP_SEND_AUTHxREQ); 
    4726   mnuUser->setItemVisible(mnuUserSendSms, nSendFuncs & PP_SEND_SMS); 
    4727   mnuUser->setItemVisible(mnuUserSendKey, nSendFuncs & PP_SEND_SECURE); 
    4728   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(6), nSendFuncs & PP_SEND_SECURE); 
     4717#if QT_VERSION >= 0x030100 
     4718#define HIDE_MENU(x, y, z) x->setItemVisible(y, z); 
     4719#else 
     4720#define HIDE_MENU(x, y, z) x->setItemEnabled(y, false); 
     4721#endif 
     4722 
     4723  HIDE_MENU(mnuUser, mnuUserSendMsg, nSendFuncs & PP_SEND_MSG) 
     4724  HIDE_MENU(mnuUser, mnuUserSendUrl, nSendFuncs & PP_SEND_URL) 
     4725  HIDE_MENU(mnuUser, mnuUserSendFile, nSendFuncs & PP_SEND_FILE) 
     4726  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(4), nSendFuncs & PP_SEND_FILE) 
     4727  HIDE_MENU(mnuUser, mnuUserSendChat, nSendFuncs & PP_SEND_CHAT) 
     4728  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(5), nSendFuncs & PP_SEND_CHAT) 
     4729  HIDE_MENU(mnuUser, mnuUserSendContact, nSendFuncs & PP_SEND_CONTACT) 
     4730  HIDE_MENU(mnuUser, mnuUserAuthorize, nSendFuncs & PP_SEND_AUTH) 
     4731  HIDE_MENU(mnuUser, mnuUserAuthorizeRequest, nSendFuncs & PP_SEND_AUTHxREQ) 
     4732  HIDE_MENU(mnuUser, mnuUserSendSms, nSendFuncs & PP_SEND_SMS) 
     4733  HIDE_MENU(mnuUser, mnuUserSendKey, nSendFuncs & PP_SEND_SECURE) 
     4734  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(6), nSendFuncs & PP_SEND_SECURE) 
    47294735   
    47304736  // ICQ Protocol only 
    4731   mnuUser->setItemVisible(mnuUserSendInfoPluginListRequest, bIsLicq); 
    4732   mnuUser->setItemVisible(mnuUserSendStatusPluginListRequest, bIsLicq); 
    4733   mnuUser->setItemVisible(mnuUserSendPhoneFollowMeRequest, bIsLicq); 
    4734   mnuUser->setItemVisible(mnuUserSendICQphoneRequest, bIsLicq); 
    4735   mnuUser->setItemVisible(mnuUserSendFileServerRequest, bIsLicq); 
    4736   mnuUser->setItemVisible(mnuUserCheckIfInvisible, bIsLicq); 
    4737   mnuUser->setItemVisible(mnuUserCheckResponse, bIsLicq); 
    4738   mnuUser->setItemVisible(mnuUserCustomAutoResponse, bIsLicq); 
     4737  HIDE_MENU(mnuUser, mnuUserSendInfoPluginListRequest, bIsLicq) 
     4738  HIDE_MENU(mnuUser, mnuUserSendStatusPluginListRequest, bIsLicq) 
     4739  HIDE_MENU(mnuUser, mnuUserSendPhoneFollowMeRequest, bIsLicq) 
     4740  HIDE_MENU(mnuUser, mnuUserSendICQphoneRequest, bIsLicq) 
     4741  HIDE_MENU(mnuUser, mnuUserSendFileServerRequest, bIsLicq) 
     4742  HIDE_MENU(mnuUser, mnuUserCheckIfInvisible, bIsLicq) 
     4743  HIDE_MENU(mnuUser, mnuUserCheckResponse, bIsLicq) 
     4744  HIDE_MENU(mnuUser, mnuUserCustomAutoResponse, bIsLicq) 
    47394745   
    47404746  // ICQ Protocol only 
    4741   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(8), bIsLicq); 
    4742   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(10), bIsLicq); 
    4743   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(11), bIsLicq); 
    4744   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(12), bIsLicq); 
    4745   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(13), bIsLicq); 
    4746   mnuMiscModes->setItemVisible(mnuMiscModes->idAt(14), bIsLicq);   
     4747  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(8), bIsLicq) 
     4748  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(10), bIsLicq) 
     4749  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(11), bIsLicq) 
     4750  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(12), bIsLicq) 
     4751  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(13), bIsLicq) 
     4752  HIDE_MENU(mnuMiscModes, mnuMiscModes->idAt(14), bIsLicq) 
    47474753   
    47484754  // FIXME: Groups! Show only what is for that protocol plugin in the submenu 

  • trunk/qt-gui/src/showawaymsgdlg.cpp

    r4256 r4466  
    185185      QRegExp regExp("<.*>"); 
    186186      regExp.setMinimal(true); 
    187       strResponse.remove(regExp); 
     187      strResponse.replace(regExp, ""); 
    188188      mleAwayMsg->setText(strResponse); 
    189189    }