Changeset 6108 for trunk/qt4-gui/src/userevents

Timestamp:

03/16/08 18:46:17 (9 months ago)

Author:

flynd

Message:

Updated variables and function names in user event dialog to conform better with code style.

Location:

trunk/qt4-gui/src/userevents

Files:

• usereventcommon.cpp (modified) (17 diffs)
• usereventcommon.h (modified) (6 diffs)
• usereventtabdlg.cpp (modified) (15 diffs)
• usereventtabdlg.h (modified) (1 diff)
• usersendchatevent.cpp (modified) (7 diffs)
• usersendchatevent.h (modified) (1 diff)
• usersendcommon.cpp (modified) (49 diffs)
• usersendcommon.h (modified) (2 diffs)
• usersendcontactevent.cpp (modified) (9 diffs)
• usersendcontactevent.h (modified) (1 diff)
• usersendfileevent.cpp (modified) (9 diffs)
• usersendfileevent.h (modified) (1 diff)
• usersendmsgevent.cpp (modified) (10 diffs)
• usersendsmsevent.cpp (modified) (6 diffs)
• usersendsmsevent.h (modified) (1 diff)
• usersendurlevent.cpp (modified) (9 diffs)
• usersendurlevent.h (modified) (1 diff)
• userviewevent.cpp (modified) (39 diffs)
• userviewevent.h (modified) (2 diffs)

trunk/qt4-gui/src/userevents/usereventcommon.cpp

@@ -57 +57 @@
 /* TRANSLATOR LicqQtGui::UserEventCommon */
 
+using std::list;
+using std::string;
+
 UserEventCommon::UserEventCommon(QString id, unsigned long ppid, QWidget* parent, const char* name)
   : QWidget(parent),
@@ -94 +97 @@
   myConvoId = 0;
 
-  top_hlay = new QHBoxLayout(this);
-  top_lay = new QVBoxLayout();
-  top_hlay->addLayout(top_lay);
-  top_hlay->setStretchFactor(top_lay, 1);
+  myTophLayout = new QHBoxLayout(this);
+  myTopLayout = new QVBoxLayout();
+  myTophLayout->addLayout(myTopLayout);
+  myTophLayout->setStretchFactor(myTopLayout, 1);
 
   QHBoxLayout* layt = new QHBoxLayout();
-  top_lay->addLayout(layt);
+  myTopLayout->addLayout(layt);
 
   myToolBar = new QToolBar();
@@ -119 +122 @@
   layt->addWidget(myTimezone);
 
-  myMenu = myToolBar->addAction(tr("Menu"), this, SLOT(slotUserMenu()));
+  myMenu = myToolBar->addAction(tr("Menu"), this, SLOT(showUserMenu()));
   myMenu->setShortcut(Qt::ALT + Qt::Key_M);
   pushToolTip(myMenu, tr("Open user menu"));
@@ -126 +129 @@
     myMenu->setEnabled(false);
 
-  myHistory = myToolBar->addAction(tr("History..."), this, SLOT(slotShowHistory()));
+  myHistory = myToolBar->addAction(tr("History..."), this, SLOT(showHistory()));
   myHistory->setShortcut(Qt::ALT + Qt::Key_H);
   pushToolTip(myHistory, tr("Show user history"));
 
-  myInfo = myToolBar->addAction(tr("User Info..."), this, SLOT(slotShowUserInfo()));
+  myInfo = myToolBar->addAction(tr("User Info..."), this, SLOT(showUserInfo()));
   myInfo->setShortcut(Qt::ALT + Qt::Key_I);
   pushToolTip(myInfo, tr("Show user information"));
 
-  popupEncoding = new QMenu(this);
+  myEncodingsMenu = new QMenu(this);
 
   myEncoding = myToolBar->addAction(tr("Encoding"), this, SLOT(showEncodingsMenu()));
   myEncoding->setShortcut(Qt::ALT + Qt::Key_O);
   pushToolTip(myEncoding, tr("Select the text encoding used for outgoing messages."));
-  myEncoding->setMenu(popupEncoding);
+  myEncoding->setMenu(myEncodingsMenu);
 
   myToolBar->addSeparator();
 
-  mySecure = myToolBar->addAction(tr("Secure Channel"), this, SLOT(slotSwitchSecurity()));
+  mySecure = myToolBar->addAction(tr("Secure Channel"), this, SLOT(switchSecurity()));
   mySecure->setShortcut(Qt::ALT + Qt::Key_E);
   pushToolTip(mySecure, tr("Open / Close secure channel"));
@@ -149 +152 @@
     mySecure->setEnabled(false);
 
-  tmrTime = NULL;
-  tmrTyping = NULL;
+  myTimeTimer = NULL;
+  myTypingTimer = NULL;
 
   ICQUser* u = gUserManager.FetchUser(myUsers.front().c_str(), myPpid, LOCK_R);
@@ -172 +175 @@
   }
 
-  encodingsGroup = new QActionGroup(this);
-  connect(encodingsGroup, SIGNAL(triggered(QAction*)), SLOT(slotSetEncoding(QAction*)));
+  myEncodingsGroup = new QActionGroup(this);
+  connect(myEncodingsGroup, SIGNAL(triggered(QAction*)), SLOT(setEncoding(QAction*)));
 
   QString codec_name = QString::fromLatin1(myCodec->name()).toLower();
@@ -190 +193 @@
       continue;
 
-    QAction* a = new QAction(UserCodec::nameForEncoding(it->encoding), encodingsGroup);
+    QAction* a = new QAction(UserCodec::nameForEncoding(it->encoding), myEncodingsGroup);
     a->setCheckable(true);
     a->setData(it->mib);
@@ -200 +203 @@
     {
       // if the current encoding does not appear in the minimal list
-      popupEncoding->insertSeparator(popupEncoding->actions()[0]);
-      popupEncoding->insertAction(popupEncoding->actions()[0], a);
+      myEncodingsMenu->insertSeparator(myEncodingsMenu->actions()[0]);
+      myEncodingsMenu->insertAction(myEncodingsMenu->actions()[0], a);
     }
     else
     {
-      popupEncoding->addAction(a);
+      myEncodingsMenu->addAction(a);
     }
   }
@@ -211 +214 @@
   // We might be called from a slot so connect the signal only after all the
   // existing signals are handled.
-  QTimer::singleShot(0, this, SLOT(slotConnectSignal()));
-
-  mainWidget = new QVBoxLayout();
-  mainWidget->setContentsMargins(0, 0, 0, 0);
-  top_lay->addLayout(mainWidget);
+  QTimer::singleShot(0, this, SLOT(connectSignal()));
+
+  myMainWidget = new QVBoxLayout();
+  myMainWidget->setContentsMargins(0, 0, 0, 0);
+  myTopLayout->addLayout(myMainWidget);
 
   updateIcons();
@@ -223 +226 @@
   if (!Config::Chat::instance()->tabbedChatting() &&
       Config::Chat::instance()->msgWinSticky())
-    QTimer::singleShot(100, this, SLOT(slotSetMsgWinSticky()));
+    QTimer::singleShot(100, this, SLOT(setMsgWinSticky()));
 }
 
@@ -259 +262 @@
   if (type == ICQ_TYPING_ACTIVE)
   {
-    if (tmrTyping->isActive())
-      tmrTyping->stop();
-    tmrTyping->setSingleShot(true);
-    tmrTyping->start(10000);
+    if (myTypingTimer->isActive())
+      myTypingTimer->stop();
+    myTypingTimer->setSingleShot(true);
+    myTypingTimer->start(10000);
 
     QPalette p = myTimezone->palette();
@@ -289 +292 @@
   {
     myRemoteTimeOffset = u->LocalTimeOffset();
-    slotUpdateTime();
-
-    if (tmrTime == NULL)
-    {
-      tmrTime = new QTimer(this);
-      connect(tmrTime, SIGNAL(timeout()), SLOT(slotUpdateTime()));
-      tmrTime->start(3000);
-    }
-  }
-
-  if (tmrTyping == NULL)
-  {
-    tmrTyping = new QTimer(this);
-    connect(tmrTyping, SIGNAL(timeout()), SLOT(slotUpdateTyping()));
+    updateTime();
+
+    if (myTimeTimer == NULL)
+    {
+      myTimeTimer = new QTimer(this);
+      connect(myTimeTimer, SIGNAL(timeout()), SLOT(updateTime()));
+      myTimeTimer->start(3000);
+    }
+  }
+
+  if (myTypingTimer == NULL)
+  {
+    myTypingTimer = new QTimer(this);
+    connect(myTypingTimer, SIGNAL(timeout()), SLOT(updateTyping()));
   }
 
@@ -345 +348 @@
 }
 
-void UserEventCommon::slotConnectSignal()
+void UserEventCommon::connectSignal()
 {
   connect(LicqGui::instance()->signalManager(),
-      SIGNAL(updatedUser(CICQSignal*)), SLOT(slotUserUpdated(CICQSignal*)));
-}
-
-void UserEventCommon::slotSetEncoding(QAction* action)
+      SIGNAL(updatedUser(CICQSignal*)), SLOT(updatedUser(CICQSignal*)));
+}
+
+void UserEventCommon::setEncoding(QAction* action)
 {
   int encodingMib = action->data().toUInt();
@@ -384 +387 @@
 }
 
-void UserEventCommon::slotSetMsgWinSticky(bool sticky)
+void UserEventCommon::setMsgWinSticky(bool sticky)
 {
   Support::changeWinSticky(winId(), sticky);
 }
 
-void UserEventCommon::slotShowHistory()
+void UserEventCommon::showHistory()
 {
   new HistoryDlg(myUsers.front().c_str(), myPpid);
 }
 
-void UserEventCommon::slotShowUserInfo()
+void UserEventCommon::showUserInfo()
 {
   LicqGui::instance()->showInfoDialog(mnuUserGeneral, myUsers.front().c_str(), myPpid, true);
 }
 
-void UserEventCommon::slotSwitchSecurity()
+void UserEventCommon::switchSecurity()
 {
   new KeyRequestDlg(QString::fromAscii(myUsers.front().c_str()), myPpid);
 }
 
-void UserEventCommon::slotUpdateTime()
+void UserEventCommon::updateTime()
 {
   QDateTime t;
@@ -411 +414 @@
 }
 
-void UserEventCommon::slotUpdateTyping()
+void UserEventCommon::updateTyping()
 {
   // MSN needs this, ICQ/AIM doesn't send additional packets
@@ -429 +432 @@
 }
 
-void UserEventCommon::slotUserMenu()
+void UserEventCommon::showUserMenu()
 {
   // Tell menu which contact to use and show it immediately.
@@ -444 +447 @@
 }
 
-void UserEventCommon::slotUserUpdated(CICQSignal* sig)
+void UserEventCommon::updatedUser(CICQSignal* sig)
 {
   if (myPpid != sig->PPID() || !isUserInConvo(sig->Id()))

trunk/qt4-gui/src/userevents/usereventcommon.h

@@ -36 +36 @@
 class ICQUser;
 
-using std::list;
-using std::string;
-
 
 namespace LicqQtGui
@@ -55 +52 @@
   unsigned long ppid() { return myPpid; }
   unsigned long convoId() { return myConvoId; }
-  list<string>& convoUsers() { return myUsers; }
+  std::list<std::string>& convoUsers() { return myUsers; }
   void setConvoId(unsigned long n) { myConvoId = n; }
   void addEventTag(unsigned long n) { if (n) myEventTag.push_back(n); }
@@ -70 +67 @@
   unsigned long myConvoId;
   time_t myRemoteTimeOffset;
-  list<string> myUsers;
+  std::list<std::string> myUsers;
   unsigned long mySendFuncs;
 
@@ -81 +78 @@
   QString myProgressMsg;
 
-  QHBoxLayout* top_hlay;
-  QVBoxLayout* top_lay;
-  QVBoxLayout* mainWidget;
+  QHBoxLayout* myTophLayout;
+  QVBoxLayout* myTopLayout;
+  QVBoxLayout* myMainWidget;
   QToolBar* myToolBar;
-  QMenu* popupEncoding;
-  QActionGroup* encodingsGroup;
+  QMenu* myEncodingsMenu;
+  QActionGroup* myEncodingsGroup;
   QAction* myMenu;
   QAction* myHistory;
@@ -97 +94 @@
   InfoField* myTimezone;
   QTextCodec* myCodec;
-  QTimer* tmrTime;
-  QTimer* tmrTyping;
+  QTimer* myTimeTimer;
+  QTimer* myTypingTimer;
 
   void flashTaskbar();
@@ -112 +109 @@
   virtual void updateIcons();
 
-  void slotConnectSignal();
-  void slotSetEncoding(QAction* action);
-  void slotSetMsgWinSticky(bool sticky = true);
-  void slotShowHistory();
-  void slotShowUserInfo();
-  void slotSwitchSecurity();
-  void slotUpdateTime();
-  void slotUpdateTyping();
-  void slotUserMenu();
+  void connectSignal();
+  void setEncoding(QAction* action);
+  void setMsgWinSticky(bool sticky = true);
+  void showHistory();
+  void showUserInfo();
+  void switchSecurity();
+  void updateTime();
+  void updateTyping();
+  void showUserMenu();
   void showEncodingsMenu();
-  void slotUserUpdated(CICQSignal* sig);
+  void updatedUser(CICQSignal* sig);
 
 signals:

trunk/qt4-gui/src/userevents/usereventtabdlg.cpp

@@ -43 +43 @@
 /* TRANSLATOR LicqQtGui::UserEventTabDlg */
 
+using std::list;
+using std::string;
+
 UserEventTabDlg::UserEventTabDlg(QWidget* parent, const char* name)
   : QWidget(parent)
@@ -55 +58 @@
     setGeometry(Config::Chat::instance()->dialogRect());
 
-  tabw = new TabWidget();
-  lay->addWidget(tabw);
-
-  connect(tabw, SIGNAL(currentChanged(int)),
-          SLOT(slotCurrentChanged(int)));
-  connect(tabw, SIGNAL(mouseMiddleClick(QWidget*)),
-          SLOT(slotRemoveTab(QWidget*)));
+  myTabs = new TabWidget();
+  lay->addWidget(myTabs);
+
+  connect(myTabs, SIGNAL(currentChanged(int)), SLOT(currentChanged(int)));
+  connect(myTabs, SIGNAL(mouseMiddleClick(QWidget*)), SLOT(removeTab(QWidget*)));
 }
 
@@ -78 +79 @@
 
   label = QString::fromUtf8(u->GetAlias());
-  index = tabw->insertTab(index, tab, label);
+  index = myTabs->insertTab(index, tab, label);
   updateTabLabel(u);
   gUserManager.DropUser(u);
-  QWidget* fw = tabw->focusWidget();
+  QWidget* fw = myTabs->focusWidget();
   if (Config::Chat::instance()->autoFocus())
-    tabw->setCurrentIndex(index);
+    myTabs->setCurrentIndex(index);
   else
     if (fw != NULL)
@@ -91 +92 @@
 void UserEventTabDlg::selectTab(QWidget* tab)
 {
-  tabw->setCurrentIndex(tabw->indexOf(tab));
+  myTabs->setCurrentIndex(myTabs->indexOf(tab));
   updateTitle(tab);
 }
@@ -97 +98 @@
 void UserEventTabDlg::replaceTab(QWidget* oldTab, UserEventCommon* newTab)
 {
-  addTab(newTab, tabw->indexOf(oldTab));
-  slotRemoveTab(oldTab);
+  addTab(newTab, myTabs->indexOf(oldTab));
+  removeTab(oldTab);
 }
 
 bool UserEventTabDlg::tabIsSelected(QWidget* tab)
 {
-  return (tabw->currentIndex() == tabw->indexOf(tab));
+  return (myTabs->currentIndex() == myTabs->indexOf(tab));
 }
 
 bool UserEventTabDlg::tabExists(QWidget* tab)
 {
-  return (tabw->indexOf(tab) != -1);
+  return (myTabs->indexOf(tab) != -1);
 }
 
@@ -134 +135 @@
   }
 
-  tabw->setTabText(tabw->indexOf(tab), newLabel);
+  myTabs->setTabText(myTabs->indexOf(tab), newLabel);
 }
 
@@ -142 +143 @@
     return;
 
-  for (int index = 0; index < tabw->count(); index++)
+  for (int index = 0; index < myTabs->count(); index++)
   {
-    UserEventCommon* tab = dynamic_cast<UserEventCommon*>(tabw->widget(index));
+    UserEventCommon* tab = dynamic_cast<UserEventCommon*>(myTabs->widget(index));
 
     if (tab->ppid() == u->PPID() && tab->isUserInConvo(u->IdString()))
@@ -177 +178 @@
 
         icon = IconManager::instance()->iconForEvent(SubCommand);
-        tabw->setTabColor(tab, QColor("blue"));
+        myTabs->setTabColor(tab, QColor("blue"));
 
         // to clear it..
@@ -187 +188 @@
 
         if (u->GetTyping() == ICQ_TYPING_ACTIVE)
-          tabw->setTabColor(tab, Config::Chat::instance()->tabTypingColor());
+          myTabs->setTabColor(tab, Config::Chat::instance()->tabTypingColor());
         else
-          tabw->setTabColor(tab, QColor("black"));
+          myTabs->setTabColor(tab, QColor("black"));
       }
 
-      tabw->setTabIcon(index, icon);
-      if (tabw->currentIndex() == index)
+      myTabs->setTabIcon(index, icon);
+      if (myTabs->currentIndex() == index)
         setWindowIcon(icon);
 
@@ -203 +204 @@
 void UserEventTabDlg::setTyping(ICQUser* u, int convoId)
 {
-  for (int index = 0; index < tabw->count(); index++)
+  for (int index = 0; index < myTabs->count(); index++)
   {
-    UserEventCommon* tab = dynamic_cast<UserEventCommon*>(tabw->widget(index));
+    UserEventCommon* tab = dynamic_cast<UserEventCommon*>(myTabs->widget(index));
 
     if (tab->convoId() == static_cast<unsigned long>(convoId) &&
@@ -227 +228 @@
  *  changed.
  */
-void UserEventTabDlg::slotCurrentChanged(int index)
-{
-  QWidget* tab = tabw->widget(index);
+void UserEventTabDlg::currentChanged(int index)
+{
+  QWidget* tab = myTabs->widget(index);
   tab->setFocus();  // prevents users from accidentally typing in the wrong widget
   updateTitle(tab);
@@ -235 +236 @@
 }
 
-void UserEventTabDlg::slotMoveLeft()
-{
-  tabw->setPreviousPage();
-}
-
-void UserEventTabDlg::slotMoveRight()
-{
-  tabw->setNextPage();
-}
-
-void UserEventTabDlg::slotRemoveTab(QWidget* tab)
-{
-  if (tabw->count() > 1)
+void UserEventTabDlg::moveLeft()
+{
+  myTabs->setPreviousPage();
+}
+
+void UserEventTabDlg::moveRight()
+{
+  myTabs->setNextPage();
+}
+
+void UserEventTabDlg::removeTab(QWidget* tab)
+{
+  if (myTabs->count() > 1)
   {
-    int index = tabw->indexOf(tab);
-    tabw->removeTab(index);
+    int index = myTabs->indexOf(tab);
+    myTabs->removeTab(index);
     tab->close();
     tab->setEnabled(false);
@@ -259 +260 @@
 }
 
-void UserEventTabDlg::slotSetMsgWinSticky(bool sticky)
+void UserEventTabDlg::setMsgWinSticky(bool sticky)
 {
   Support::changeWinSticky(winId(), sticky);
@@ -270 +271 @@
     setWindowTitle(title);
 
-  QIcon icon = tabw->tabIcon(tabw->indexOf(tab));
+  QIcon icon = myTabs->tabIcon(myTabs->indexOf(tab));
   if (!icon.isNull())
     setWindowIcon(icon);
@@ -281 +282 @@
 
   UserSendCommon* e = dynamic_cast<UserSendCommon*>(tab);
-  QTimer::singleShot(e->clearDelay, e, SLOT(slotClearNewEvents()));
+  QTimer::singleShot(e->clearDelay, e, SLOT(clearNewEvents()));
 }
 

trunk/qt4-gui/src/userevents/usereventtabdlg.h

@@ -58 +58 @@
 
 public slots:
-  void slotCurrentChanged(int index);
-  void slotMoveLeft();
-  void slotMoveRight();
-  void slotRemoveTab(QWidget* tab);
-  void slotSetMsgWinSticky(bool sticky = true);
+  void currentChanged(int index);
+  void moveLeft();
+  void moveRight();
+  void removeTab(QWidget* tab);
+  void setMsgWinSticky(bool sticky = true);
 
 private:
-  TabWidget* tabw;
+  TabWidget* myTabs;
 
   void updateTitle(QWidget* tab);

trunk/qt4-gui/src/userevents/usersendchatevent.cpp

@@ -51 +51 @@
 {
   myChatPort = 0;
-  chkMass->setChecked(false);
-  chkMass->setEnabled(false);
+  myMassMessageCheck->setChecked(false);
+  myMassMessageCheck->setEnabled(false);
   myForeColor->setEnabled(false);
   myBackColor->setEnabled(false);
 
-  mainWidget->addWidget(splView);
+  myMainWidget->addWidget(myViewSplitter);
 
   if (!Config::Chat::instance()->msgChatView())
-    mleSend->setMinimumHeight(150);
+    myMessageEdit->setMinimumHeight(150);
 
   QHBoxLayout* h_lay = new QHBoxLayout();
-  mainWidget->addLayout(h_lay);
-  lblItem = new QLabel(tr("Multiparty: "));
-  h_lay->addWidget(lblItem);
+  myMainWidget->addLayout(h_lay);
+  myItemLabel = new QLabel(tr("Multiparty: "));
+  h_lay->addWidget(myItemLabel);
 
-  edtItem = new InfoField(false);
-  h_lay->addWidget(edtItem);
+  myItemEdit = new InfoField(false);
+  h_lay->addWidget(myItemEdit);
 
-  btnBrowse = new QPushButton(tr("Invite"));
-  connect(btnBrowse, SIGNAL(clicked()), SLOT(inviteUser()));
-  h_lay->addWidget(btnBrowse);
+  myBrowseButton = new QPushButton(tr("Invite"));
+  connect(myBrowseButton, SIGNAL(clicked()), SLOT(inviteUser()));
+  h_lay->addWidget(myBrowseButton);
 
   myBaseTitle += tr(" - Chat Request");
@@ -80 +80 @@
 
   setWindowTitle(myBaseTitle);
-  grpSendType->actions().at(ChatEvent)->setChecked(true);
+  myEventTypeGroup->actions().at(ChatEvent)->setChecked(true);
 }
 
@@ -118 +118 @@
 void UserSendChatEvent::resetSettings()
 {
-  mleSend->clear();
-  edtItem->clear();
-  mleSend->setFocus();
-  slotMassMessageToggled(false);
+  myMessageEdit->clear();
+  myItemEdit->clear();
+  myMessageEdit->setFocus();
+  massMessageToggled(false);
 }
 
@@ -134 +134 @@
       if (j->exec() && (chatDlg = j->JoinedChat()) != NULL)
       {
-        edtItem->setText(j->ChatClients());
+        myItemEdit->setText(j->ChatClients());