Changeset 5725

Show
Ignore:
Timestamp:
2007-10-29 02:18:09 (9 months ago)
Author:
flynd
Message:

Renamed ewidgets to messagebox, also removed "Licq" from the class names.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/qt-gui_qt4/src/CMakeLists.txt

    r5724 r5725  
    11# Sources common for both Qt4- and KDE4-GUI 
    22set(Qt-GUI_SRCS 
    3   ewidgets.cpp 
    43  historyview.cpp 
    54  licqgui.cpp 
    65  mainwin.cpp 
     6  messagebox.cpp 
    77  mlview.cpp 
    88  signalmanager.cpp 

  • branches/qt-gui_qt4/src/dialogs/chatdlg.cpp

    r5694 r5725  
    7272#include "helpers/support.h" 
    7373#include "helpers/usercodec.h" 
    74 #include "ewidgets.h" 
     74#include "messagebox.h" 
    7575 
    7676// --------------------------------------------------------------------------- 

  • branches/qt-gui_qt4/src/dialogs/editfiledlg.cpp

    r5577 r5725  
    3434#include "widgets/mledit.h" 
    3535 
    36 #include "ewidgets.h" 
     36#include "messagebox.h" 
    3737 
    3838using namespace LicqQtGui; 

  • branches/qt-gui_qt4/src/dialogs/editgrpdlg.cpp

    r5577 r5725  
    3838#include "widgets/infofield.h" 
    3939 
    40 #include "ewidgets.h" 
     40#include "messagebox.h" 
    4141 
    4242using namespace LicqQtGui; 

  • branches/qt-gui_qt4/src/dialogs/filedlg.cpp

    r5577 r5725  
    5151#include "widgets/mledit.h" 
    5252 
    53 #include "ewidgets.h" 
     53#include "messagebox.h" 
    5454 
    5555using namespace LicqQtGui; 

  • branches/qt-gui_qt4/src/dialogs/forwarddlg.cpp

    r5577 r5725  
    4343#include "widgets/infofield.h" 
    4444 
    45 #include "ewidgets.h" 
     45#include "messagebox.h" 
    4646#include "gui-defines.h" 
    4747#include "mainwin.h" 

  • branches/qt-gui_qt4/src/dialogs/logwindow.cpp

    r5676 r5725  
    4444 
    4545#include "widgets/mledit.h" 
    46 #include "ewidgets.h" 
     46#include "messagebox.h" 
    4747 
    4848#undef connect 

  • branches/qt-gui_qt4/src/dialogs/ownermanagerdlg.cpp

    r5580 r5725  
    4242#include "helpers/support.h" 
    4343 
    44 #include "ewidgets.h" 
     44#include "messagebox.h" 
    4545#include "gui-defines.h" 
    4646#include "mainwin.h" 

  • branches/qt-gui_qt4/src/dialogs/phonedlg.cpp

    r5701 r5725  
    4040#include "helpers/usercodec.h" 
    4141 
    42 #include "ewidgets.h" 
     42#include "messagebox.h" 
    4343 
    4444using namespace LicqQtGui; 

  • branches/qt-gui_qt4/src/dialogs/plugindlg.cpp

    r5577 r5725  
    4343#include "helpers/support.h" 
    4444 
    45 #include "ewidgets.h" 
     45#include "messagebox.h" 
    4646#include "editfiledlg.h" 
    4747 

  • branches/qt-gui_qt4/src/dialogs/randomchatdlg.cpp

    r5577 r5725  
    3434#include "helpers/support.h" 
    3535 
    36 #include "ewidgets.h" 
     36#include "messagebox.h" 
    3737#include "gui-defines.h" 
    3838#include "mainwin.h" 

  • branches/qt-gui_qt4/src/dialogs/registeruser.cpp

    r5682 r5725  
    3434#include <licq_icqd.h> 
    3535 
    36 #include "ewidgets.h" 
     36#include "messagebox.h" 
    3737#include "signalmanager.h" 
    3838#include "helpers/support.h" 

  • branches/qt-gui_qt4/src/dialogs/searchuserdlg.cpp

    r5580 r5725  
    4646#include "helpers/support.h" 
    4747#include "widgets/tabwidget.h" 
    48 #include "ewidgets.h" 
     48#include "messagebox.h" 
    4949#include "gui-defines.h" 
    5050#include "mainwin.h" 

  • branches/qt-gui_qt4/src/dialogs/securitydlg.cpp

    r5577 r5725  
    4040#include "helpers/support.h" 
    4141 
    42 #include "ewidgets.h" 
     42#include "messagebox.h" 
    4343#include "signalmanager.h" 
    4444 

  • branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp

    r5723 r5725  
    5050 
    5151#include "editfiledlg.h" 
    52 #include "ewidgets.h" 
     52#include "messagebox.h" 
    5353#include "gui-defines.h" 
    5454#include "mainwin.h" 

  • branches/qt-gui_qt4/src/dialogs/userinfodlg.cpp

    r5701 r5725  
    8888#include "editcategorydlg.h" 
    8989#include "editfiledlg.h" 
    90 #include "ewidgets.h" 
     90#include "messagebox.h" 
    9191#include "historyview.h" 
    9292#include "mainwin.h" 

  • branches/qt-gui_qt4/src/dialogs/utilitydlg.cpp

    r5577 r5725  
    3939#include "widgets/mledit.h" 
    4040 
    41 #include "ewidgets.h" 
     41#include "messagebox.h" 
    4242 
    4343using namespace LicqQtGui; 

  • branches/qt-gui_qt4/src/dockicons/themeddockicon.cpp

    r5580 r5725  
    3232 
    3333#include "config/general.h" 
    34 #include "ewidgets.h" 
     34#include "messagebox.h" 
    3535#include "gui-defines.h" 
    3636 

  • branches/qt-gui_qt4/src/mainwin.cpp

    r5723 r5725  
    133133#include "views/floatyview.h" 
    134134 
    135 #include "ewidgets.h" 
     135#include "messagebox.h" 
    136136#include "gui-defines.h" 
    137137#include "signalmanager.h" 

  • branches/qt-gui_qt4/src/menus/usermenu.cpp

    r5579 r5725  
    4141#include "dialogs/utilitydlg.h" 
    4242#include "helpers/strings.h" 
    43 #include "ewidgets.h" 
     43#include "messagebox.h" 
    4444#include "gui-defines.h" 
    4545#include "mainwin.h" 

  • branches/qt-gui_qt4/src/messagebox.cpp

    r5612 r5725  
    1919 */ 
    2020 
    21 #include "ewidgets.h" 
     21#include "messagebox.h" 
    2222 
    2323#include "config.h" 
    …… 
    4545using namespace std; 
    4646 
    47 /* TRANSLATOR LicqQtGui::LicqMessageBox */ 
     47/* TRANSLATOR LicqQtGui::MessageBox */ 
    4848 
    4949/*! \brief Dialog with configurable yes/no buttons 
    …… 
    9797void LicqQtGui::InformUser(QWidget *q, QString sz) 
    9898{ 
    99   LicqMessageManager::Instance()->addMessage(QMessageBox::Information, sz, q); 
     99  MessageManager::Instance()->addMessage(QMessageBox::Information, sz, q); 
    100100} 
    101101 
    102102void LicqQtGui::WarnUser(QWidget *q, QString sz) 
    103103{ 
    104   LicqMessageManager::Instance()->addMessage(QMessageBox::Warning, sz, q); 
     104  MessageManager::Instance()->addMessage(QMessageBox::Warning, sz, q); 
    105105} 
    106106 
    107107void LicqQtGui::CriticalUser(QWidget *q, QString sz) 
    108108{ 
    109   LicqMessageManager::Instance()->addMessage(QMessageBox::Critical, sz, q); 
     109  MessageManager::Instance()->addMessage(QMessageBox::Critical, sz, q); 
    110110} 
    111111 
    112112// ----------------------------------------------------------------------------- 
    113113 
    114 LicqMessageBox::LicqMessageBox(QWidget *parent) 
     114MessageBox::MessageBox(QWidget *parent) 
    115115  : QDialog(parent, Qt::Dialog), m_nUnreadNum(0) 
    116116{ 
    …… 
    174174} 
    175175 
    176 void LicqMessageBox::addMessage(QMessageBox::Icon type, const QString &msg) 
     176void MessageBox::addMessage(QMessageBox::Icon type, const QString &msg) 
    177177{ 
    178178  bool unread = false; 
    …… 
    215215  } 
    216216 
    217   LicqMessageBoxItem* pEntry = new LicqMessageBoxItem(); 
     217  MessageBoxItem* pEntry = new MessageBoxItem(); 
    218218  // Resize the icon 
    219219  img = pix.toImage(); 
    …… 
    246246/// oldest unread message. 
    247247/// //////////////////////////////////////////////////////// 
    248 void LicqMessageBox::slot_toggleMore() 
     248void MessageBox::slot_toggleMore() 
    249249{ 
    250250  showExtension(m_frmList->isHidden()); 
    …… 
    257257/// unread message. The text and icon will both be updated. 
    258258/// //////////////////////////////////////////////////////// 
    259 void LicqMessageBox::slot_clickNext() 
     259void MessageBox::slot_clickNext() 
    260260{ 
    261261  // Find the next unread message 
    262262  bool bFound = false; 
    263   LicqMessageBoxItem *item = 0; 
     263  MessageBoxItem *item = 0; 
    264264  for (int i = m_lstMsg->currentRow(); i >= 0; --i) 
    265265  { 
    266     item = dynamic_cast<LicqMessageBoxItem *>(m_lstMsg->item(i)); 
     266    item = dynamic_cast<MessageBoxItem *>(m_lstMsg->item(i)); 
    267267    if (item->isUnread()) 
    268268    { 
    …… 
    277277    for (int i = m_lstMsg->count() - 1; i >= 0; --i) 
    278278    { 
    279       item = dynamic_cast<LicqMessageBoxItem *>(m_lstMsg->item(i)); 
     279      item = dynamic_cast<MessageBoxItem *>(m_lstMsg->item(i)); 
    280280      if (item->isUnread()) 
    281281      { 
    …… 
    297297/// remove all messages from the queue. 
    298298/// //////////////////////////////////////////////////////// 
    299 void LicqMessageBox::slot_clickClear() 
     299void MessageBox::slot_clickClear() 
    300300{ 
    301301  // Hide the window first 
    …… 
    315315/// @param item The new QListViewItem that has been selected 
    316316/// //////////////////////////////////////////////////////// 
    317 void LicqMessageBox::slot_listChanged(QListWidgetItem *i, QListWidgetItem* /* previous */) 
     317void MessageBox::slot_listChanged(QListWidgetItem *i, QListWidgetItem* /* previous */) 
    318318{ 
    319319  // Change the icon, message and caption 
    320   LicqMessageBoxItem *item = dynamic_cast<LicqMessageBoxItem *>(i); 
     320  MessageBoxItem *item = dynamic_cast<MessageBoxItem *>(i); 
    321321  if (item != NULL) 
    322322  { 
    …… 
    350350/// @brief Change the caption of the message box 
    351351/// 
    352 /// @param item The LicqMessageBoxItem that will be shown 
    353 /// //////////////////////////////////////////////////////// 
    354 void LicqMessageBox::updateCaption(LicqMessageBoxItem *item) 
     352/// @param item The MessageBoxItem that will be shown 
     353/// //////////////////////////////////////////////////////// 
     354void MessageBox::updateCaption(MessageBoxItem *item) 
    355355{ 
    356356  if (!item) 
    …… 
    381381} 
    382382 
    383 QPixmap LicqMessageBox::getMessageIcon(QMessageBox::Icon type) 
     383QPixmap MessageBox::getMessageIcon(QMessageBox::Icon type) 
    384384{ 
    385385#ifdef USE_KDE 
    …… 
    413413} 
    414414 
    415 LicqMessageManager *LicqMessageManager::m_pInstance = 0; 
    416  
    417 LicqMessageManager::LicqMessageManager() 
     415MessageManager *MessageManager::m_pInstance = 0; 
     416 
     417MessageManager::MessageManager() 
    418418  : m_pMsgDlg(0) 
    419419{ 
    420420} 
    421421 
    422 LicqMessageManager::~LicqMessageManager() 
     422MessageManager::~MessageManager() 
    423423{ 
    424424  if (m_pMsgDlg) 
    …… 
    426426} 
    427427 
    428 LicqMessageManager *LicqMessageManager::Instance() 
     428MessageManager *MessageManager::Instance() 
    429429{ 
    430430  if (m_pInstance == 0) 
    431     m_pInstance = new LicqMessageManager; 
     431    m_pInstance = new MessageManager; 
    432432 
    433433  return m_pInstance; 
    434434} 
    435435 
    436 void LicqMessageManager::addMessage(QMessageBox::Icon type, const QString &msg, 
     436void MessageManager::addMessage(QMessageBox::Icon type, const QString &msg, 
    437437  QWidget *parent) 
    438438{ 
    …… 
    443443  parent = 0; // XXX See comment above 
    444444  if (m_pMsgDlg == 0) 
    445     m_pMsgDlg = new LicqMessageBox(parent); 
     445    m_pMsgDlg = new MessageBox(parent); 
    446446 
    447447  m_pMsgDlg->addMessage(type, msg); 
    …… 
    449449} 
    450450 
    451 LicqMessageBoxItem::LicqMessageBoxItem(QListWidget *parent) 
     451MessageBoxItem::MessageBoxItem(QListWidget *parent) 
    452452  : QListWidgetItem(parent) 
    453453{ 
    …… 
    455455} 
    456456 
    457 void LicqMessageBoxItem::setUnread(bool b) 
     457void MessageBoxItem::setUnread(bool b) 
    458458{ 
    459459  m_unread = b; 

  • branches/qt-gui_qt4/src/messagebox.h

    r5383 r5725  
    1818 */ 
    1919 
    20 #ifndef EWIDGETS_H 
    21 #define EWIDGETS_H 
     20#ifndef MESSAGEBOX_H 
     21#define MESSAGEBOX_H 
    2222 
    2323#include <QListWidget> 
    …… 
    4747/* ----------------------------------------------------------------------------- */ 
    4848 
    49 class LicqMessageBoxItem : public QListWidgetItem 
     49class MessageBoxItem : public QListWidgetItem 
    5050{ 
    5151public: 
    52   LicqMessageBoxItem(QListWidget* parent = 0); 
     52  MessageBoxItem(QListWidget* parent = 0); 
    5353 
    5454  void setMessage(const QString &s) { m_msg = s; } 
    …… 
    6969}; 
    7070 
    71 class LicqMessageBox : public QDialog 
     71class MessageBox : public QDialog 
    7272{ 
    7373  Q_OBJECT 
    7474public: 
    75   LicqMessageBox(QWidget *parent = 0); 
     75  MessageBox(QWidget *parent = 0); 
    7676  void addMessage(QMessageBox::Icon type, const QString &msg); 
    7777 
    …… 
    8484private: 
    8585  QPixmap getMessageIcon(QMessageBox::Icon); 
    86   void updateCaption(LicqMessageBoxItem *); 
     86  void updateCaption(MessageBoxItem *); 
    8787 
    8888  int m_nUnreadNum; 
    …… 
    9696}; 
    9797 
    98 class LicqMessageManager 
     98class MessageManager 
    9999{ 
    100100public: 
    101   ~LicqMessageManager(); 
     101  ~MessageManager(); 
    102102 
    103   static LicqMessageManager *Instance(); 
     103  static MessageManager *Instance(); 
    104104 
    105105  void addMessage(QMessageBox::Icon type, const QString &msg, QWidget *p); 
    106106 
    107107private: 
    108   LicqMessageManager(); 
    109   LicqMessageManager(const LicqMessageManager &); 
    110   LicqMessageManager &operator=(const LicqMessageManager &); 
     108  MessageManager(); 
     109  MessageManager(const MessageManager &); 
     110  MessageManager &operator=(const MessageManager &); 
    111111 
    112   static LicqMessageManager *m_pInstance; 
    113   LicqMessageBox *m_pMsgDlg; 
     112  static MessageManager *m_pInstance; 
     113  MessageBox *m_pMsgDlg; 
    114114}; 
    115115 

  • branches/qt-gui_qt4/src/userevents/usereventcommon.cpp

    r5685 r5725  
    5757#include "widgets/infofield.h" 
    5858 
    59 #include "ewidgets.h" 
     59#include "messagebox.h" 
    6060#include "mainwin.h" 
    6161#include "signalmanager.h" 

  • branches/qt-gui_qt4/src/userevents/usersendchatevent.cpp

    r5649 r5725  
    3838 
    3939#include "mainwin.h" 
    40 #include "ewidgets.h" 
     40#include "messagebox.h" 
    4141 
    4242#include "usereventtabdlg.h" 

  • branches/qt-gui_qt4/src/userevents/usersendcommon.cpp

    r5723 r5725  
    6060#include "widgets/mledit.h" 
    6161 
    62 #include "ewidgets.h" 
     62#include "messagebox.h" 
    6363#include "historyview.h" 
    6464#include "mainwin.h" 

  • branches/qt-gui_qt4/src/userevents/usersendfileevent.cpp

    r5649 r5725  
    4242 
    4343#include "mainwin.h" 
    44 #include "ewidgets.h" 
     44#include "messagebox.h" 
    4545 
    4646#include "usereventtabdlg.h" 

  • branches/qt-gui_qt4/src/userevents/usersendmsgevent.cpp

    r5649 r5725  
    3636 
    3737#include "mainwin.h" 
    38 #include "ewidgets.h" 
     38#include "messagebox.h" 
    3939 
    4040#include "usereventcommon.h" 

  • branches/qt-gui_qt4/src/userevents/usersendsmsevent.cpp

    r5649 r5725  
    3535 
    3636#include "mainwin.h" 
    37 #include "ewidgets.h" 
     37#include "messagebox.h" 
    3838 
    3939#include "usereventtabdlg.h" 

  • branches/qt-gui_qt4/src/userevents/usersendurlevent.cpp

    r5649 r5725  
    3939 
    4040#include "mainwin.h" 
    41 #include "ewidgets.h" 
     41#include "messagebox.h" 
    4242 
    4343#include "usereventtabdlg.h" 

  • branches/qt-gui_qt4/src/userevents/userviewevent.cpp

    r5724 r5725  
    5252#include "widgets/skinnablebutton.h" 
    5353 
    54 #include "ewidgets.h" 
     54#include "messagebox.h" 
    5555#include "gui-defines.h" 
    5656#include "mainwin.h" 

  • branches/qt-gui_qt4/src/views/mmuserview.cpp

    r5612 r5725  
    4444 
    4545#include "gui-defines.h" 
    46 #include "ewidgets.h" 
     46#include "messagebox.h" 
    4747 
    4848using namespace LicqQtGui;