[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim/KDE/4.10] /: Fix mem leak. Initialize variables. REmove not necessary variables
From: Montel Laurent <montel () kde ! org>
Date: 2013-02-13 22:51:56
Message-ID: 20130213225156.AB46AA6091 () git ! kde ! org
[Download RAW message or body]
Git commit d2a73972e51814b97125d5f5437ee3ba1aa82f7c by Montel Laurent.
Committed on 13/02/2013 at 23:50.
Pushed by mlaurent into branch 'KDE/4.10'.
Fix mem leak. Initialize variables. REmove not necessary variables
M +7 -1 akonadiconsole/agentconfigmodel.cpp
M +1 -0 akonadiconsole/agentconfigmodel.h
M +1 -1 blogilo/src/composer/dialogs/addmediadialog.cpp
M +0 -1 calendarsupport/calendaradaptor.h
M +2 -1 calendarviews/eventviews/month/monthview.cpp
M +1 -1 incidenceeditor-ng/categorydialog.cpp
M +2 -0 incidenceeditor-ng/schedulingdialog.h
M +0 -3 incidenceeditor-ng/visualfreebusywidget.h
M +1 -0 kjots/kjotsedit.cpp
M +1 -0 kmail/identitypage.cpp
M +1 -1 libkdepim/kdatepickerpopup.cpp
M +1 -1 mailcommon/filter/filteractionwidget.cpp
M +14 -4 mailfilteragent/mailfilteragent.cpp
M +8 -9 messagecore/emailaddressrequester.cpp
M +5 -1 messagelist/core/messageitem.cpp
M +1 -0 messagelist/core/widgetbase.cpp
M +1 -1 messagelist/utils/aggregationconfigbutton.cpp
M +1 -1 messagelist/utils/themeconfigbutton.cpp
http://commits.kde.org/kdepim/d2a73972e51814b97125d5f5437ee3ba1aa82f7c
diff --git a/akonadiconsole/agentconfigmodel.cpp \
b/akonadiconsole/agentconfigmodel.cpp index 6c7a853..853e072 100644
--- a/akonadiconsole/agentconfigmodel.cpp
+++ b/akonadiconsole/agentconfigmodel.cpp
@@ -25,10 +25,15 @@
#include <QMetaMethod>
#include <KLocalizedString>
-AgentConfigModel::AgentConfigModel(QObject* parent): QAbstractTableModel(parent)
+AgentConfigModel::AgentConfigModel(QObject* parent): QAbstractTableModel(parent), \
m_interface( 0 ) {
}
+AgentConfigModel::~AgentConfigModel()
+{
+ delete m_interface;
+}
+
void AgentConfigModel::setAgentInstance(const Akonadi::AgentInstance& instance)
{
m_settings.clear();
@@ -39,6 +44,7 @@ void AgentConfigModel::setAgentInstance(const \
Akonadi::AgentInstance& instance) "/Settings" );
if ( !m_interface->isValid() ) {
kError() << "Unable to obtain KConfigXT D-Bus interface of agent" << \
instance.identifier(); + delete m_interface;
return;
}
diff --git a/akonadiconsole/agentconfigmodel.h b/akonadiconsole/agentconfigmodel.h
index b90c12f..353b10c 100644
--- a/akonadiconsole/agentconfigmodel.h
+++ b/akonadiconsole/agentconfigmodel.h
@@ -32,6 +32,7 @@ class AgentConfigModel : public QAbstractTableModel
Q_OBJECT
public:
AgentConfigModel( QObject * parent = 0 );
+ ~AgentConfigModel();
void setAgentInstance( const Akonadi::AgentInstance &instance );
int columnCount(const QModelIndex& parent = QModelIndex()) const;
diff --git a/blogilo/src/composer/dialogs/addmediadialog.cpp \
b/blogilo/src/composer/dialogs/addmediadialog.cpp index 6a93873..82a6c3d 100644
--- a/blogilo/src/composer/dialogs/addmediadialog.cpp
+++ b/blogilo/src/composer/dialogs/addmediadialog.cpp
@@ -39,7 +39,7 @@
#include "bilbomedia.h"
#include "settings.h"
-AddMediaDialog::AddMediaDialog( QWidget *parent ) : KDialog( parent )
+AddMediaDialog::AddMediaDialog( QWidget *parent ) : KDialog( parent ), media( 0 )
{
QWidget *dialog = new QWidget( this );
ui.setupUi( dialog );
diff --git a/calendarsupport/calendaradaptor.h b/calendarsupport/calendaradaptor.h
index 2a30cf3..82696560f 100644
--- a/calendarsupport/calendaradaptor.h
+++ b/calendarsupport/calendaradaptor.h
@@ -189,7 +189,6 @@ class CALENDARSUPPORT_EXPORT CalendarAdaptor : public \
KCalCore::MemoryCalendar
void schedule( KCalCore::iTIPMethod method, const Akonadi::Item &item );
Akonadi::Collection mDefaultCollection;
- CalendarSupport::Calendar *mCalendar;
QWidget *mParent;
bool mDeleteCalendar;
bool mStoreDefaultCollection;
diff --git a/calendarviews/eventviews/month/monthview.cpp \
b/calendarviews/eventviews/month/monthview.cpp index f7ff367..1f38cf0 100644
--- a/calendarviews/eventviews/month/monthview.cpp
+++ b/calendarviews/eventviews/month/monthview.cpp
@@ -84,7 +84,8 @@ MonthViewPrivate::MonthViewPrivate( MonthView *qq )
//calendarSearch( new CalendarSupport::CalendarSearch( qq ) ),
scene( new MonthScene( qq ) ),
selectedItemId( -1 ),
- view( new MonthGraphicsView( qq ) )
+ view( new MonthGraphicsView( qq ) ),
+ fullView( 0 )
{
reloadTimer.setSingleShot( true );
view->setScene( scene );
diff --git a/incidenceeditor-ng/categorydialog.cpp \
b/incidenceeditor-ng/categorydialog.cpp index 836e1b5..0fb15f2 100644
--- a/incidenceeditor-ng/categorydialog.cpp
+++ b/incidenceeditor-ng/categorydialog.cpp
@@ -229,7 +229,7 @@ void CategoryWidget::handleColorChanged( const QColor &newColor )
}
CategoryDialog::CategoryDialog( CategoryConfig *cc, QWidget *parent )
- : KDialog( parent )
+ : KDialog( parent ), d( 0 )
{
setCaption( i18n( "Select Categories" ) );
#ifdef KDEPIM_MOBILE_UI
diff --git a/incidenceeditor-ng/schedulingdialog.h \
b/incidenceeditor-ng/schedulingdialog.h index 50a8e58..b90a77d 100644
--- a/incidenceeditor-ng/schedulingdialog.h
+++ b/incidenceeditor-ng/schedulingdialog.h
@@ -76,7 +76,9 @@ class INCIDENCEEDITORS_NG_EXPORT SchedulingDialog : public KDialog, \
private Ui_D
ConflictResolver *mResolver;
FreePeriodModel *mPeriodModel;
+#ifndef KDEPIM_MOBILE_UI
VisualFreeBusyWidget *mVisualWidget;
+#endif
};
}
diff --git a/incidenceeditor-ng/visualfreebusywidget.h \
b/incidenceeditor-ng/visualfreebusywidget.h index 947c896..223c378 100644
--- a/incidenceeditor-ng/visualfreebusywidget.h
+++ b/incidenceeditor-ng/visualfreebusywidget.h
@@ -76,9 +76,6 @@ class INCIDENCEEDITORS_NG_EXPORT VisualFreeBusyWidget : public \
QWidget FreeBusyGanttProxyModel *mModel;
KDateTime mDtStart, mDtEnd;
-
- FreeBusyItemModel *m;
- bool mIsOrganizer;
};
}
diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp
index 88fd50a..708da9f 100644
--- a/kjots/kjotsedit.cpp
+++ b/kjots/kjotsedit.cpp
@@ -62,6 +62,7 @@ using namespace Akonadi;
KJotsEdit::KJotsEdit ( QItemSelectionModel *selectionModel, QWidget *parent )
: KRichTextWidget(parent),
+ actionCollection( 0 ),
allowAutoDecimal(false),
m_selectionModel( selectionModel )
{
diff --git a/kmail/identitypage.cpp b/kmail/identitypage.cpp
index 2b2f653..f9dfe13 100644
--- a/kmail/identitypage.cpp
+++ b/kmail/identitypage.cpp
@@ -49,6 +49,7 @@ QString IdentityPage::helpAnchor() const
IdentityPage::IdentityPage( const KComponentData &instance, QWidget *parent )
: ConfigModule( instance, parent ),
mIdentityDialog( 0 ),
+ mOldNumberOfIdentities( 0 ),
mIdentityManager( 0 )
{
if ( !MailCommon::Kernel::self()->kernelIsRegistered() ) {
diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp
index da6480d..e8b26f8 100644
--- a/libkdepim/kdatepickerpopup.cpp
+++ b/libkdepim/kdatepickerpopup.cpp
@@ -63,7 +63,7 @@ class KDatePickerPopup::Private
{
public:
Private( KDatePickerPopup *qq )
- : q( qq )
+ : q( qq ), mDatePicker( 0 )
{
}
diff --git a/mailcommon/filter/filteractionwidget.cpp \
b/mailcommon/filter/filteractionwidget.cpp index fc0a1f5..cea5eca 100644
--- a/mailcommon/filter/filteractionwidget.cpp
+++ b/mailcommon/filter/filteractionwidget.cpp
@@ -43,7 +43,7 @@ class FilterActionWidget::Private
{
public:
Private( FilterActionWidget *qq )
- : q( qq )
+ : q( qq ), mComboBox( 0 ), mAdd( 0 ), mRemove( 0 ), mLayout( 0 )
{
}
diff --git a/mailfilteragent/mailfilteragent.cpp \
b/mailfilteragent/mailfilteragent.cpp index 00df47c..44b7b5d 100644
--- a/mailfilteragent/mailfilteragent.cpp
+++ b/mailfilteragent/mailfilteragent.cpp
@@ -148,8 +148,11 @@ void MailFilterAgent::itemAdded( const Akonadi::Item &item, \
const Akonadi::Colle /* The monitor mimetype filter would override the collection \
filter, therefor we have to check
* for the mimetype of the item here.
*/
- if ( item.mimeType() != KMime::Message::mimeType() )
+ qDebug()<<" MailFilterAgent::itemAdded :"<<item.id();
+ if ( item.mimeType() != KMime::Message::mimeType() ) {
+ qDebug() << "MailFilterAgent::itemAdded called for a non-message item!";
return;
+ }
MailCommon::SearchRule::RequiredPart requiredPart = \
m_filterManager->requiredPart(collection.resource());
@@ -171,22 +174,29 @@ void MailFilterAgent::itemAdded( const Akonadi::Item &item, \
const Akonadi::Colle
void MailFilterAgent::itemsReceiviedForFiltering (const Akonadi::Item::List& items)
{
- if (items.isEmpty())
+ if (items.isEmpty()) {
+ qDebug() << "MailFilterAgent::itemsReceiviedForFiltering items is empty!";
return;
+ }
Akonadi::Item item = items.first();
/*
* happens when item no longer exists etc, and queue compression didn't happen yet
*/
- if ( !item.hasPayload() )
+ if ( !item.hasPayload() ) {
+ qDebug() << "MailFilterAgent::itemsReceiviedForFiltering item has no payload!";
return;
+ }
Akonadi::MessageStatus status;
status.setStatusFromFlags( item.flags() );
- if ( status.isRead() || status.isSpam() || status.isIgnored() )
+ if ( status.isRead() || status.isSpam() || status.isIgnored() ) {
+ qDebug() << "MailFilterAgent::itemsReceiviedForFiltering message not filtered \
because its status: " << status.isRead() << status.isSpam() << status.isIgnored(); \
return; + }
const QString resource = sender()->property("resource").toString();
+qDebug()<<" itemsReceiviedForFiltering********************************************** \
:"<<item.id()<<" resource :"<<resource; emitProgressMessage(i18n("Filtering in \
%1",Akonadi::AgentManager::self()->instance(resource).name()) ); \
m_filterManager->process( item, m_filterManager->requiredPart(resource), \
FilterManager::Inbound, true, resource );
diff --git a/messagecore/emailaddressrequester.cpp \
b/messagecore/emailaddressrequester.cpp index 030cdf8..e942ab8 100644
--- a/messagecore/emailaddressrequester.cpp
+++ b/messagecore/emailaddressrequester.cpp
@@ -33,14 +33,13 @@ class MessageCore::EmailAddressRequester::Private
{
public:
Private( EmailAddressRequester *qq )
- : q( qq )
+ : q( qq ), mLineEdit( 0 )
{
}
void slotAddressBook();
EmailAddressRequester *q;
- QPushButton* mButton;
KLineEdit* mLineEdit;
};
@@ -80,14 +79,14 @@ EmailAddressRequester::EmailAddressRequester( QWidget *parent )
layout->addWidget( d->mLineEdit, 1 );
- d->mButton = new QPushButton( this );
- d->mButton->setIcon( KIcon( "help-contents" ) );
- d->mButton->setIconSize( QSize( KIconLoader::SizeSmall, KIconLoader::SizeSmall ) \
);
- d->mButton->setFixedHeight( d->mLineEdit->sizeHint().height() );
- d->mButton->setToolTip( i18n( "Open Address Book" ) );
- layout->addWidget( d->mButton );
+ QPushButton *button = new QPushButton( this );
+ button->setIcon( KIcon( "help-contents" ) );
+ button->setIconSize( QSize( KIconLoader::SizeSmall, KIconLoader::SizeSmall ) );
+ button->setFixedHeight( d->mLineEdit->sizeHint().height() );
+ button->setToolTip( i18n( "Open Address Book" ) );
+ layout->addWidget( button );
- connect( d->mButton, SIGNAL(clicked()), this, SLOT(slotAddressBook()) );
+ connect( button, SIGNAL(clicked()), this, SLOT(slotAddressBook()) );
connect( d->mLineEdit, SIGNAL(textChanged(QString)),
this, SIGNAL(textChanged()) );
}
diff --git a/messagelist/core/messageitem.cpp b/messagelist/core/messageitem.cpp
index 9845dd9..7ea062e 100644
--- a/messagelist/core/messageitem.cpp
+++ b/messagelist/core/messageitem.cpp
@@ -143,8 +143,12 @@ QString MessageItemPrivate::mFontToDoMessageKey;
MessageItemPrivate::MessageItemPrivate( MessageItem* qq )
: ItemPrivate( qq ),
mThreadingStatus( MessageItem::ParentMissing ),
+ mEncryptionState( MessageItem::NotEncrypted ),
+ mSignatureState( MessageItem::NotSigned ),
mAboutToBeRemoved( false ),
- mAnnotationStateChecked( false ),
+ mSubjectIsPrefixed( false ),
+ mAnnotationStateChecked( false ),
+ mHasAnnotation( false ),
mTagList( 0 )
{
}
diff --git a/messagelist/core/widgetbase.cpp b/messagelist/core/widgetbase.cpp
index eb18de6..b95eba9 100644
--- a/messagelist/core/widgetbase.cpp
+++ b/messagelist/core/widgetbase.cpp
@@ -65,6 +65,7 @@ public:
: q( owner ), mView( 0 ), mSearchEdit( 0 ),
mSearchTimer( 0 ), mStatusFilterCombo( 0 ),
mOpenFullSearchButton( 0 ),
+ mLockSearch( 0 ),
mStorageModel( 0 ), mAggregation( 0 ),
mTheme( 0 ), mFilter( 0 ),
mStorageUsesPrivateTheme( false ),
diff --git a/messagelist/utils/aggregationconfigbutton.cpp \
b/messagelist/utils/aggregationconfigbutton.cpp index 33b89dd..ee05ea0 100644
--- a/messagelist/utils/aggregationconfigbutton.cpp
+++ b/messagelist/utils/aggregationconfigbutton.cpp
@@ -32,7 +32,7 @@ class MessageList::Utils::AggregationConfigButtonPrivate
{
public:
AggregationConfigButtonPrivate( AggregationConfigButton *owner )
- : q( owner ) { }
+ : q( owner ), mAggregationComboBox( 0 ) { }
AggregationConfigButton * const q;
diff --git a/messagelist/utils/themeconfigbutton.cpp \
b/messagelist/utils/themeconfigbutton.cpp index 05df0c4..dfd55c5 100644
--- a/messagelist/utils/themeconfigbutton.cpp
+++ b/messagelist/utils/themeconfigbutton.cpp
@@ -33,7 +33,7 @@ class MessageList::Utils::ThemeConfigButtonPrivate
{
public:
ThemeConfigButtonPrivate( ThemeConfigButton *owner )
- : q( owner ) { }
+ : q( owner ), mThemeComboBox( 0 ) { }
ThemeConfigButton * const q;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic