Show
Ignore:
Timestamp:
03/15/08 06:57:17 (9 months ago)
Author:
flynd
Message:

Adjusted variable names and indentation to be more in line with coding style.

Location:
trunk/qt4-gui/src/dialogs
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/qt4-gui/src/dialogs/randomchatdlg.cpp

    r6097 r6099  
    4343/* TRANSLATOR LicqQtGui::SetRandomChatGroupDlg */ 
    4444 
    45 RandomChatDlg::RandomChatDlg(QWidget* p) 
    46   : QDialog(p), 
    47     tag(0) 
     45RandomChatDlg::RandomChatDlg(QWidget* parent) 
     46  : QDialog(parent), 
     47    myTag(0) 
    4848{ 
    4949  Support::setWidgetProps(this, "RandomChatDialog"); 
    … …  
    5151  setWindowTitle(tr("Random Chat Search")); 
    5252 
    53   QVBoxLayout* top_lay = new QVBoxLayout(this); 
    54   lstGroups = new QListWidget(this); 
    55   top_lay->addWidget(lstGroups); 
     53  QVBoxLayout* topLayout = new QVBoxLayout(this); 
     54  myGroupsList = new QListWidget(this); 
     55  topLayout->addWidget(myGroupsList); 
    5656 
    5757  QDialogButtonBox* buttons = new QDialogButtonBox(); 
    58   top_lay->addWidget(buttons); 
    59   btnOk = buttons->addButton(QDialogButtonBox::Ok); 
    60   btnOk->setText(tr("&Search")); 
    61   btnCancel = buttons->addButton(QDialogButtonBox::Cancel); 
    62  
    63   connect(btnOk, SIGNAL(clicked()), SLOT(slot_ok())); 
    64   connect(btnCancel, SIGNAL(clicked()), SLOT(close())); 
     58  topLayout->addWidget(buttons); 
     59  myOkButton = buttons->addButton(QDialogButtonBox::Ok); 
     60  myOkButton->setText(tr("&Search")); 
     61  myCancelButton = buttons->addButton(QDialogButtonBox::Cancel); 
     62 
     63  connect(myOkButton, SIGNAL(clicked()), SLOT(okPressed())); 
     64  connect(myCancelButton, SIGNAL(clicked()), SLOT(close())); 
    6565 
    6666  // Fill in the combo box 
    67   lstGroups->addItem(tr("General")); 
    68   lstGroups->addItem(tr("Romance")); 
    69   lstGroups->addItem(tr("Games")); 
    70   lstGroups->addItem(tr("Students")); 
    71   lstGroups->addItem(tr("20 Something")); 
    72   lstGroups->addItem(tr("30 Something")); 
    73   lstGroups->addItem(tr("40 Something")); 
    74   lstGroups->addItem(tr("50 Plus")); 
    75   lstGroups->addItem(tr("Seeking Women")); 
    76   lstGroups->addItem(tr("Seeking Men")); 
    77  
    78   lstGroups->setCurrentRow(0); 
     67  myGroupsList->addItem(tr("General")); 
     68  myGroupsList->addItem(tr("Romance")); 
     69  myGroupsList->addItem(tr("Games")); 
     70  myGroupsList->addItem(tr("Students")); 
     71  myGroupsList->addItem(tr("20 Something")); 
     72  myGroupsList->addItem(tr("30 Something")); 
     73  myGroupsList->addItem(tr("40 Something")); 
     74  myGroupsList->addItem(tr("50 Plus")); 
     75  myGroupsList->addItem(tr("Seeking Women")); 
     76  myGroupsList->addItem(tr("Seeking Men")); 
     77 
     78  myGroupsList->setCurrentRow(0); 
    7979 
    8080  show(); 
    8181} 
    8282 
    83  
    8483RandomChatDlg::~RandomChatDlg() 
    8584{ 
    86   if (tag != 0) 
    87     gLicqDaemon->CancelEvent(tag); 
    88 } 
    89  
    90  
    91 void RandomChatDlg::slot_ok() 
    92 { 
    93   btnOk->setEnabled(false); 
     85  if (myTag != 0) 
     86    gLicqDaemon->CancelEvent(myTag); 
     87} 
     88 
     89void RandomChatDlg::okPressed() 
     90{ 
     91  myOkButton->setEnabled(false); 
    9492  connect(LicqGui::instance()->signalManager(), 
    95       SIGNAL(doneUserFcn(ICQEvent*)), SLOT(slot_doneUserFcn(ICQEvent*))); 
     93      SIGNAL(doneUserFcn(ICQEvent*)), SLOT(userEventDone(ICQEvent*))); 
    9694  unsigned long nGroup = ICQ_RANDOMxCHATxGROUP_NONE; 
    97   switch(lstGroups->currentRow()) 
     95  switch(myGroupsList->currentRow()) 
    9896  { 
    9997    case 0: nGroup = ICQ_RANDOMxCHATxGROUP_GENERAL; break; 
    … …  
    108106    case 9: nGroup = ICQ_RANDOMxCHATxGROUP_FxSEEKxM; break; 
    109107  } 
    110   tag = gLicqDaemon->icqRandomChatSearch(nGroup); 
     108  myTag = gLicqDaemon->icqRandomChatSearch(nGroup); 
    111109  setWindowTitle(tr("Searching for Random Chat Partner...")); 
    112110} 
    113111 
    114  
    115 void RandomChatDlg::slot_doneUserFcn(ICQEvent* e) 
    116 { 
    117   if (!e->Equals(tag)) return; 
    118  
    119   btnOk->setEnabled(true); 
    120   tag = 0; 
    121  
    122   switch (e->Result()) 
    123   { 
    124   case EVENT_FAILED: 
    125     WarnUser(this, tr("No random chat user found in that group.")); 
    126     break; 
    127   case EVENT_TIMEDOUT: 
    128     WarnUser(this, tr("Random chat search timed out.")); 
    129     break; 
    130   case EVENT_ERROR: 
    131     WarnUser(this, tr("Random chat search had an error.")); 
    132     break; 
    133   default: 
    134     //TODO when CSearchAck changes 
    135     LicqGui::instance()->showEventDialog(ChatEvent, e->SearchAck()->Id(), 
    136                           e->SearchAck()->PPID() ); 
     112void RandomChatDlg::userEventDone(ICQEvent* event) 
     113{ 
     114  if (!event->Equals(myTag)) 
     115    return; 
     116 
     117  myOkButton->setEnabled(true); 
     118  myTag = 0; 
     119 
     120  switch (event->Result()) 
     121  { 
     122    case EVENT_FAILED: 
     123      WarnUser(this, tr("No random chat user found in that group.")); 
     124      break; 
     125    case EVENT_TIMEDOUT: 
     126      WarnUser(this, tr("Random chat search timed out.")); 
     127      break; 
     128    case EVENT_ERROR: 
     129      WarnUser(this, tr("Random chat search had an error.")); 
     130      break; 
     131    default: 
     132      //TODO when CSearchAck changes 
     133      LicqGui::instance()->showEventDialog(ChatEvent, event->SearchAck()->Id(), 
     134          event->SearchAck()->PPID() ); 
     135      close(); 
     136      return; 
     137  } 
     138 
     139} 
     140 
     141//=====SetRandomChatGroupDlg================================================ 
     142 
     143SetRandomChatGroupDlg::SetRandomChatGroupDlg(QWidget* parent) 
     144  : QDialog(parent), 
     145    myTag(0) 
     146{ 
     147  Support::setWidgetProps(this, "SetRandomChatGroupDlg"); 
     148  setWindowTitle(tr("Set Random Chat Group")); 
     149 
     150  QVBoxLayout* topLayout = new QVBoxLayout(this); 
     151  myGroupsList = new QListWidget(this); 
     152  topLayout->addWidget(myGroupsList); 
     153 
     154  QHBoxLayout* lay = new QHBoxLayout(); 
     155 
     156  lay->addStretch(2); 
     157  myOkButton = new QPushButton(tr("&Set"), this); 
     158  lay->addWidget(myOkButton); 
     159 
     160  lay->addSpacing(10); 
     161  myCancelButton = new QPushButton(tr("&Close"), this); 
     162  lay->addWidget(myCancelButton); 
     163  lay->addStretch(2); 
     164 
     165  topLayout->addLayout(lay); 
     166 
     167  connect(myOkButton, SIGNAL(clicked()), SLOT(okPressed())); 
     168  connect(myCancelButton, SIGNAL(clicked()), SLOT(close())); 
     169 
     170  // Fill in the combo box 
     171  myGroupsList->addItem(tr("(none)")); 
     172  myGroupsList->addItem(tr("General")); 
     173  myGroupsList->addItem(tr("Romance")); 
     174  myGroupsList->addItem(tr("Games")); 
     175  myGroupsList->addItem(tr("Students")); 
     176  myGroupsList->addItem(tr("20 Something")); 
     177  myGroupsList->addItem(tr("30 Something")); 
     178  myGroupsList->addItem(tr("40 Something")); 
     179  myGroupsList->addItem(tr("50 Plus")); 
     180  myGroupsList->addItem(tr("Seeking Women")); 
     181  myGroupsList->addItem(tr("Seeking Men")); 
     182 
     183  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R); 
     184  if (o == 0) 
     185  { 
    137186    close(); 
    138187    return; 
    139188  } 
    140  
    141 } 
    142  
    143 //=====SetRandomChatGroupDlg================================================ 
    144  
    145 SetRandomChatGroupDlg::SetRandomChatGroupDlg(QWidget* p) 
    146   : QDialog(p), 
    147     tag(0) 
    148 { 
    149   Support::setWidgetProps(this, "SetRandomChatGroupDlg"); 
    150   setWindowTitle(tr("Set Random Chat Group")); 
    151  
    152   QVBoxLayout* top_lay = new QVBoxLayout(this); 
    153   lstGroups = new QListWidget(this); 
    154   top_lay->addWidget(lstGroups); 
    155  
    156   QHBoxLayout* lay = new QHBoxLayout(); 
    157  
    158   lay->addStretch(2); 
    159   btnOk = new QPushButton(tr("&Set"), this); 
    160   lay->addWidget(btnOk); 
    161  
    162   lay->addSpacing(10); 
    163   btnCancel = new QPushButton(tr("&Close"), this); 
    164   lay->addWidget(btnCancel); 
    165   lay->addStretch(2); 
    166  
    167   top_lay->addLayout(lay); 
    168  
    169   connect(btnOk, SIGNAL(clicked()), SLOT(slot_ok())); 
    170   connect(btnCancel, SIGNAL(clicked()), SLOT(close())); 
    171  
    172   // Fill in the combo box 
    173   lstGroups->addItem(tr("(none)")); 
    174   lstGroups->addItem(tr("General")); 
    175   lstGroups->addItem(tr("Romance")); 
    176   lstGroups->addItem(tr("Games")); 
    177   lstGroups->addItem(tr("Students")); 
    178   lstGroups->addItem(tr("20 Something")); 
    179   lstGroups->addItem(tr("30 Something")); 
    180   lstGroups->addItem(tr("40 Something")); 
    181   lstGroups->addItem(tr("50 Plus")); 
    182   lstGroups->addItem(tr("Seeking Women")); 
    183   lstGroups->addItem(tr("Seeking Men")); 
    184  
    185   ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R); 
    186   if (o == 0) 
    187   { 
    188     close(); 
    189     return; 
    190   } 
    191189  switch(o->RandomChatGroup()) 
    192190  { 
    193     case ICQ_RANDOMxCHATxGROUP_GENERAL: lstGroups->setCurrentRow(1); break; 
    194     case ICQ_RANDOMxCHATxGROUP_ROMANCE: lstGroups->setCurrentRow(2); break; 
    195     case ICQ_RANDOMxCHATxGROUP_GAMES: lstGroups->setCurrentRow(3); break; 
    196     case ICQ_RANDOMxCHATxGROUP_STUDENTS: lstGroups->setCurrentRow(4); break; 
    197     case ICQ_RANDOMxCHATxGROUP_20SOME: lstGroups->setCurrentRow(5); break; 
    198     case ICQ_RANDOMxCHATxGROUP_30SOME: lstGroups->setCurrentRow(6); break; 
    199     case ICQ_RANDOMxCHATxGROUP_40SOME: lstGroups->setCurrentRow(7); break; 
    200     case ICQ_RANDOMxCHATxGROUP_50PLUS: lstGroups->setCurrentRow(8); break; 
    201     case ICQ_RANDOMxCHATxGROUP_MxSEEKxF: lstGroups->setCurrentRow(9); break; 
    202     case ICQ_RANDOMxCHATxGROUP_FxSEEKxM: lstGroups->setCurrentRow(10); break; 
     191    case ICQ_RANDOMxCHATxGROUP_GENERAL: myGroupsList->setCurrentRow(1); break; 
     192    case ICQ_RANDOMxCHATxGROUP_ROMANCE: myGroupsList->setCurrentRow(2); break; 
     193    case ICQ_RANDOMxCHATxGROUP_GAMES: myGroupsList->setCurrentRow(3); break; 
     194    case ICQ_RANDOMxCHATxGROUP_STUDENTS: myGroupsList->setCurrentRow(4); break; 
     195    case ICQ_RANDOMxCHATxGROUP_20SOME: myGroupsList->setCurrentRow(5); break; 
     196    case ICQ_RANDOMxCHATxGROUP_30SOME: myGroupsList->setCurrentRow(6); break; 
     197    case ICQ_RANDOMxCHATxGROUP_40SOME: myGroupsList->setCurrentRow(7); break; 
     198    case ICQ_RANDOMxCHATxGROUP_50PLUS: myGroupsList->setCurrentRow(8); break; 
     199    case ICQ_RANDOMxCHATxGROUP_MxSEEKxF: myGroupsList->setCurrentRow(9); break; 
     200    case ICQ_RANDOMxCHATxGROUP_FxSEEKxM: myGroupsList->setCurrentRow(10); break; 
    203201    case ICQ_RANDOMxCHATxGROUP_NONE: 
    204202    default: 
    205       lstGroups->setCurrentRow(0); break; 
     203      myGroupsList->setCurrentRow(0); break; 
    206204  } 
    207205  gUserManager.DropOwner(); 
    … …  
    210208} 
    211209 
    212  
    213210SetRandomChatGroupDlg::~SetRandomChatGroupDlg() 
    214211{ 
    215   if (tag != 0) 
    216     gLicqDaemon->CancelEvent(tag); 
    217 } 
    218  
    219  
    220 void SetRandomChatGroupDlg::slot_ok() 
    221 { 
    222   btnOk->setEnabled(false); 
    223   btnCancel = new QPushButton(tr("&Cancel"), this); 
     212  if (myTag != 0) 
     213    gLicqDaemon->CancelEvent(myTag); 
     214} 
     215 
     216void SetRandomChatGroupDlg::okPressed() 
     217{ 
     218  myOkButton->setEnabled(false); 
     219  myCancelButton = new QPushButton(tr("&Cancel"), this); 
    224220  connect(LicqGui::instance()->signalManager(), 
    225       SIGNAL(doneUserFcn(ICQEvent*)), SLOT(slot_doneUserFcn(ICQEvent*))); 
     221      SIGNAL(doneUserFcn(ICQEvent*)), SLOT(userEventDone(ICQEvent*))); 
    226222  unsigned long nGroup = ICQ_RANDOMxCHATxGROUP_NONE; 
    227   switch(lstGroups->currentRow()) 
     223  switch(myGroupsList->currentRow()) 
    228224  { 
    229225    case 0: nGroup = ICQ_RANDOMxCHATxGROUP_NONE; break; 
    … …  
    239235    case 10: nGroup = ICQ_RANDOMxCHATxGROUP_FxSEEKxM; break; 
    240236  } 
    241   tag = gLicqDaemon->icqSetRandomChatGroup(nGroup); 
     237  myTag = gLicqDaemon->icqSetRandomChatGroup(nGroup); 
    242238  setWindowTitle(tr("Setting Random Chat Group...")); 
    243239} 
    244240 
    245  
    246 void SetRandomChatGroupDlg::slot_doneUserFcn(ICQEvent* e) 
    247 { 
    248   if (!e->Equals(tag)) return; 
    249  
    250   btnOk->setEnabled(true); 
    251   btnCancel = new QPushButton(tr("&Close"), this); 
    252   tag = 0; 
    253  
    254   switch (e->Result()) 
    255   { 
    256   case EVENT_FAILED: 
    257     setWindowTitle(windowTitle() + tr("failed")); 
    258     break; 
    259   case EVENT_TIMEDOUT: 
    260     setWindowTitle(windowTitle() + tr("timed out")); 
    261     break; 
    262   case EVENT_ERROR: 
    263     setWindowTitle(windowTitle() + tr("error")); 
    264     break; 
    265   default: 
    266     setWindowTitle(windowTitle() + tr("done")); 
    267     break; 
    268   } 
    269  
    270 } 
     241void SetRandomChatGroupDlg::userEventDone(ICQEvent* event) 
     242{ 
     243  if (!event->Equals(myTag)) 
     244    return; 
     245 
     246  myOkButton->setEnabled(true); 
     247  myCancelButton = new QPushButton(tr("&Close"), this); 
     248  myTag = 0; 
     249 
     250  switch (event->Result()) 
     251  { 
     252    case EVENT_FAILED: 
     253      setWindowTitle(windowTitle() + tr("failed")); 
     254      break; 
     255    case EVENT_TIMEDOUT: 
     256      setWindowTitle(windowTitle() + tr("timed out")); 
     257      break; 
     258    case EVENT_ERROR: 
     259      setWindowTitle(windowTitle() + tr("error")); 
     260      break; 
     261    default: 
     262      setWindowTitle(windowTitle() + tr("done")); 
     263      break; 
     264  } 
     265} 

  • trunk/qt4-gui/src/dialogs/randomchatdlg.h

    r5837 r6099  
    4141 
    4242private: 
    43   QListWidget* lstGroups; 
    44   QPushButton* btnOk; 
    45   QPushButton* btnCancel; 
    46   unsigned long tag; 
     43  QListWidget* myGroupsList; 
     44  QPushButton* myOkButton; 
     45  QPushButton* myCancelButton; 
     46  unsigned long myTag; 
    4747 
    4848private slots: 
    49   void slot_ok(); 
    50   void slot_doneUserFcn(ICQEvent*); 
     49  void okPressed(); 
     50  void userEventDone(ICQEvent* event); 
    5151}; 
    5252 
    … …  
    6060 
    6161private: 
    62   QListWidget* lstGroups; 
    63   QPushButton* btnOk; 
    64   QPushButton* btnCancel; 
    65   unsigned long tag; 
     62  QListWidget* myGroupsList; 
     63  QPushButton* myOkButton; 
     64  QPushButton* myCancelButton; 
     65  unsigned long myTag; 
    6666 
    6767private slots: 
    68   void slot_ok(); 
    69   void slot_doneUserFcn(ICQEvent *); 
     68  void okPressed(); 
     69  void userEventDone(ICQEvent* event); 
    7070}; 
    7171