Commit 06f8dff8 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

[ #13801 ] Fix more pseudo warning

parent 24c90366
......@@ -25,7 +25,6 @@
#include <QtCore/QString>
#include <QtCore/QDate>
#include <QtGui/QTreeWidget>
#include <QtGui/QComboBox>
#include <QtGui/QPushButton>
#include <QtGui/QLabel>
#include <QtGui/QTreeWidgetItem>
......@@ -38,6 +37,7 @@
#include <KIcon>
#include <KLineEdit>
#include <KDateWidget>
#include <KComboBox>
//SFLPhone
#include "SFLPhone.h"
......@@ -92,7 +92,7 @@ HistoryDock::HistoryDock(QWidget* parent) : QDockWidget(parent)
setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
m_pFilterLE = new KLineEdit ( );
m_pItemView = new HistoryTree ( this );
m_pSortByCBB = new QComboBox ( );
m_pSortByCBB = new KComboBox ( );
m_pSortByL = new QLabel ( i18n("Sort by:") );
m_pFromL = new QLabel ( i18n("From:") );
m_pToL = new QLabel ( i18nc("To date:","To:"));
......@@ -197,7 +197,7 @@ HistoryDock::~HistoryDock()
* *
****************************************************************************/
///Update informations
///Update information
void HistoryDock::updateContactInfo()
{
foreach(HistoryTreeItem* hitem, m_History) {
......@@ -381,7 +381,7 @@ QMimeData* HistoryTree::mimeData( const QList<QTreeWidgetItem *> items) const
{
kDebug() << "An history call is being dragged";
if (items.size() < 1) {
return NULL;
return nullptr;
}
QMimeData *mimeData = new QMimeData();
......
......@@ -32,7 +32,7 @@
class QTreeWidgetItem;
class QString;
class QTreeWidget;
class QComboBox;
class KComboBox;
class QLabel;
class QCheckBox;
class QPushButton;
......@@ -68,7 +68,7 @@ private:
//Attributes
HistoryTree* m_pItemView ;
KLineEdit* m_pFilterLE ;
QComboBox* m_pSortByCBB ;
KComboBox* m_pSortByCBB ;
QLabel* m_pSortByL ;
QLabel* m_pFromL ;
QLabel* m_pToL ;
......
......@@ -307,7 +307,7 @@ void HistoryTreeItem::copy()
}
///Create a contact from those informations
///Create a contact from those information
void HistoryTreeItem::addContact()
{
kDebug() << "Adding contact";
......@@ -548,7 +548,7 @@ bool HistoryTreeItem::getContactInfo(QString phoneNumber)
if (m_pContact) {
m_Name = m_pContact->getFormattedName();
m_pPeerNameL->setText("<b>"+m_Name+"</b>");
if (m_pContact->getPhoto() != NULL) {
if (m_pContact->getPhoto() != nullptr) {
pxm = (*m_pContact->getPhoto());
QRect pxRect = pxm.rect();
QBitmap mask(pxRect.size());
......@@ -640,7 +640,7 @@ uint HistoryTreeItem::getDurWidth()
return fm.width(m_pLengthL->text());
}
///Called when a drag and drop occure while the item have not been dropped yet
///Called when a drag and drop occur while the item have not been dropped yet
void HistoryTreeItem::dragEnterEvent ( QDragEnterEvent *e )
{
kDebug() << "Drag enter";
......@@ -679,7 +679,7 @@ void HistoryTreeItem::transferEvent(QMimeData* data)
if (data->hasFormat( MIME_CALLID)) {
Call* call = SFLPhone::model()->getCall(data->data(MIME_CALLID));
if (dynamic_cast<Call*>(call)) {
call->changeCurrentState(CALL_STATE_TRANSFER);
call->changeCurrentState(CALL_STATE_TRANSFERRED);
SFLPhone::model()->transfer(call, m_pItemCall->getPeerPhoneNumber());
}
}
......
......@@ -24,7 +24,7 @@
#include <KDebug>
#include <KLocale>
IMManager::IMManager(QWidget* parent) : QTabWidget(parent)
IMManager::IMManager(QWidget* parent) : KTabWidget(parent)
{
setVisible(false);
setTabsClosable(true);
......
......@@ -21,15 +21,18 @@
#ifndef IM_MANAGER_H
#define IM_MANAGER_H
//Qt
#include <QtCore/QHash>
#include <QtGui/QTabWidget>
//KDE
#include <KTabWidget>
//SFLPhone
class IMTab;
class InstantMessagingModel;
class Call;
class IMManager : public QTabWidget
class IMManager : public KTabWidget
{
Q_OBJECT
public:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment