Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Mail-related libraries
Commits
1ad74958
Commit
1ad74958
authored
Jan 02, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GIT_SILENT: use nullptr now
parent
8d889bd0
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
20 additions
and
20 deletions
+20
-20
kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp
...bookgrantlee/src/printing/autotests/grantleeprinttest.cpp
+6
-6
kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h
...ssbookgrantlee/src/printing/autotests/grantleeprinttest.h
+1
-1
kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp
...okimportexport/src/kaddressbookcontactselectiondialog.cpp
+1
-1
kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
...bookimportexport/src/kaddressbookcontactselectiondialog.h
+1
-1
kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h
...bookimportexport/src/kaddressbookcontactselectionwidget.h
+1
-1
kaddressbookimportexport/src/kaddressbookexportselectionwidget.h
...sbookimportexport/src/kaddressbookexportselectionwidget.h
+1
-1
kaddressbookimportexport/src/kaddressbookimportexportplugin.h
...ressbookimportexport/src/kaddressbookimportexportplugin.h
+1
-1
kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
...ortexport/src/kaddressbookimportexportplugininterface.cpp
+1
-1
kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
...mportexport/src/kaddressbookimportexportplugininterface.h
+1
-1
kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp
...mportexport/src/kaddressbookimportexportpluginmanager.cpp
+2
-2
kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h
...kimportexport/src/kaddressbookimportexportpluginmanager.h
+1
-1
libsendlater/src/sendlaterdialog.cpp
libsendlater/src/sendlaterdialog.cpp
+1
-1
libsendlater/src/sendlaterdialog.h
libsendlater/src/sendlaterdialog.h
+1
-1
libsendlater/src/sendlatertimedatewidget.h
libsendlater/src/sendlatertimedatewidget.h
+1
-1
No files found.
kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp
View file @
1ad74958
...
@@ -37,7 +37,7 @@ void GrantleePrintTest::shouldHaveDefaultValue()
...
@@ -37,7 +37,7 @@ void GrantleePrintTest::shouldHaveDefaultValue()
KAddressBookGrantlee
::
GrantleePrint
*
grantleePrint
=
new
KAddressBookGrantlee
::
GrantleePrint
;
KAddressBookGrantlee
::
GrantleePrint
*
grantleePrint
=
new
KAddressBookGrantlee
::
GrantleePrint
;
QVERIFY
(
grantleePrint
);
QVERIFY
(
grantleePrint
);
grantleePrint
->
deleteLater
();
grantleePrint
->
deleteLater
();
grantleePrint
=
Q_NULLPTR
;
grantleePrint
=
nullptr
;
}
}
void
GrantleePrintTest
::
shouldReturnEmptyStringWhenNotContentAndNoContacts
()
void
GrantleePrintTest
::
shouldReturnEmptyStringWhenNotContentAndNoContacts
()
...
@@ -46,7 +46,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts()
...
@@ -46,7 +46,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts()
KContacts
::
Addressee
::
List
lst
;
KContacts
::
Addressee
::
List
lst
;
QVERIFY
(
grantleePrint
->
contactsToHtml
(
lst
).
isEmpty
());
QVERIFY
(
grantleePrint
->
contactsToHtml
(
lst
).
isEmpty
());
grantleePrint
->
deleteLater
();
grantleePrint
->
deleteLater
();
grantleePrint
=
Q_NULLPTR
;
grantleePrint
=
nullptr
;
}
}
void
GrantleePrintTest
::
shouldReturnEmptyStringWhenAddContentWithoutContacts
()
void
GrantleePrintTest
::
shouldReturnEmptyStringWhenAddContentWithoutContacts
()
...
@@ -57,7 +57,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts()
...
@@ -57,7 +57,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts()
QVERIFY
(
grantleePrint
->
contactsToHtml
(
lst
).
isEmpty
());
QVERIFY
(
grantleePrint
->
contactsToHtml
(
lst
).
isEmpty
());
grantleePrint
->
deleteLater
();
grantleePrint
->
deleteLater
();
grantleePrint
=
Q_NULLPTR
;
grantleePrint
=
nullptr
;
}
}
void
GrantleePrintTest
::
shouldReturnStringWhenAddContentAndContacts
()
void
GrantleePrintTest
::
shouldReturnStringWhenAddContentAndContacts
()
...
@@ -72,7 +72,7 @@ void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts()
...
@@ -72,7 +72,7 @@ void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts()
QCOMPARE
(
grantleePrint
->
contactsToHtml
(
lst
),
QStringLiteral
(
"foo"
));
QCOMPARE
(
grantleePrint
->
contactsToHtml
(
lst
),
QStringLiteral
(
"foo"
));
grantleePrint
->
deleteLater
();
grantleePrint
->
deleteLater
();
grantleePrint
=
Q_NULLPTR
;
grantleePrint
=
nullptr
;
}
}
void
GrantleePrintTest
::
shouldReturnEmails
()
void
GrantleePrintTest
::
shouldReturnEmails
()
...
@@ -87,7 +87,7 @@ void GrantleePrintTest::shouldReturnEmails()
...
@@ -87,7 +87,7 @@ void GrantleePrintTest::shouldReturnEmails()
QCOMPARE
(
grantleePrint
->
contactsToHtml
(
lst
),
QStringLiteral
(
"foo1"
));
QCOMPARE
(
grantleePrint
->
contactsToHtml
(
lst
),
QStringLiteral
(
"foo1"
));
grantleePrint
->
deleteLater
();
grantleePrint
->
deleteLater
();
grantleePrint
=
Q_NULLPTR
;
grantleePrint
=
nullptr
;
}
}
void
GrantleePrintTest
::
shouldDisplayContactInfo_data
()
void
GrantleePrintTest
::
shouldDisplayContactInfo_data
()
...
@@ -148,7 +148,7 @@ void GrantleePrintTest::shouldDisplayContactInfo()
...
@@ -148,7 +148,7 @@ void GrantleePrintTest::shouldDisplayContactInfo()
QCOMPARE
(
grantleePrint
->
contactsToHtml
(
lst
),
result
);
QCOMPARE
(
grantleePrint
->
contactsToHtml
(
lst
),
result
);
grantleePrint
->
deleteLater
();
grantleePrint
->
deleteLater
();
grantleePrint
=
Q_NULLPTR
;
grantleePrint
=
nullptr
;
}
}
QTEST_MAIN
(
GrantleePrintTest
)
QTEST_MAIN
(
GrantleePrintTest
)
kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h
View file @
1ad74958
...
@@ -26,7 +26,7 @@ class GrantleePrintTest : public QObject
...
@@ -26,7 +26,7 @@ class GrantleePrintTest : public QObject
{
{
Q_OBJECT
Q_OBJECT
public:
public:
explicit
GrantleePrintTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
GrantleePrintTest
(
QObject
*
parent
=
nullptr
);
~
GrantleePrintTest
();
~
GrantleePrintTest
();
private
Q_SLOTS
:
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
void
shouldHaveDefaultValue
();
...
...
kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp
View file @
1ad74958
...
@@ -30,7 +30,7 @@ using namespace KAddressBookImportExport;
...
@@ -30,7 +30,7 @@ using namespace KAddressBookImportExport;
KAddressBookContactSelectionDialog
::
KAddressBookContactSelectionDialog
(
QItemSelectionModel
*
selectionModel
,
bool
allowToSelectTypeToExport
,
KAddressBookContactSelectionDialog
::
KAddressBookContactSelectionDialog
(
QItemSelectionModel
*
selectionModel
,
bool
allowToSelectTypeToExport
,
QWidget
*
parent
)
QWidget
*
parent
)
:
QDialog
(
parent
),
:
QDialog
(
parent
),
mVCardExport
(
Q_NULLPTR
)
mVCardExport
(
nullptr
)
{
{
setWindowTitle
(
i18n
(
"Select Contacts"
));
setWindowTitle
(
i18n
(
"Select Contacts"
));
...
...
kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h
View file @
1ad74958
...
@@ -54,7 +54,7 @@ public:
...
@@ -54,7 +54,7 @@ public:
* @param selectionModel The model that contains the currently selected contacts.
* @param selectionModel The model that contains the currently selected contacts.
* @param parent The parent widget.
* @param parent The parent widget.
*/
*/
explicit
KAddressBookContactSelectionDialog
(
QItemSelectionModel
*
selectionModel
,
bool
allowToSelectTypeToExport
,
QWidget
*
parent
=
Q_NULLPTR
);
explicit
KAddressBookContactSelectionDialog
(
QItemSelectionModel
*
selectionModel
,
bool
allowToSelectTypeToExport
,
QWidget
*
parent
=
nullptr
);
/**
/**
* Sets the @p message text.
* Sets the @p message text.
...
...
kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h
View file @
1ad74958
...
@@ -57,7 +57,7 @@ public:
...
@@ -57,7 +57,7 @@ public:
* @param selectionModel The model that contains the currently selected contacts.
* @param selectionModel The model that contains the currently selected contacts.
* @param parent The parent widget.
* @param parent The parent widget.
*/
*/
explicit
KAddressBookContactSelectionWidget
(
QItemSelectionModel
*
selectionModel
,
QWidget
*
parent
=
Q_NULLPTR
);
explicit
KAddressBookContactSelectionWidget
(
QItemSelectionModel
*
selectionModel
,
QWidget
*
parent
=
nullptr
);
/**
/**
* Sets the @p message text.
* Sets the @p message text.
...
...
kaddressbookimportexport/src/kaddressbookexportselectionwidget.h
View file @
1ad74958
...
@@ -29,7 +29,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookExportSelectionWidget : publi
...
@@ -29,7 +29,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookExportSelectionWidget : publi
{
{
Q_OBJECT
Q_OBJECT
public:
public:
explicit
KAddressBookExportSelectionWidget
(
QWidget
*
parent
=
Q_NULLPTR
);
explicit
KAddressBookExportSelectionWidget
(
QWidget
*
parent
=
nullptr
);
~
KAddressBookExportSelectionWidget
();
~
KAddressBookExportSelectionWidget
();
enum
ExportField
{
enum
ExportField
{
None
=
0
,
None
=
0
,
...
...
kaddressbookimportexport/src/kaddressbookimportexportplugin.h
View file @
1ad74958
...
@@ -30,7 +30,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPlugin : public P
...
@@ -30,7 +30,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPlugin : public P
{
{
Q_OBJECT
Q_OBJECT
public:
public:
explicit
KAddressBookImportExportPlugin
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
KAddressBookImportExportPlugin
(
QObject
*
parent
=
nullptr
);
~
KAddressBookImportExportPlugin
();
~
KAddressBookImportExportPlugin
();
};
};
}
}
...
...
kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp
View file @
1ad74958
...
@@ -24,7 +24,7 @@ using namespace KAddressBookImportExport;
...
@@ -24,7 +24,7 @@ using namespace KAddressBookImportExport;
KAddressBookImportExportPluginInterface
::
KAddressBookImportExportPluginInterface
(
QObject
*
parent
)
KAddressBookImportExportPluginInterface
::
KAddressBookImportExportPluginInterface
(
QObject
*
parent
)
:
PimCommon
::
AbstractGenericPluginInterface
(
parent
),
:
PimCommon
::
AbstractGenericPluginInterface
(
parent
),
mImportExportAction
(
Import
),
mImportExportAction
(
Import
),
mItemSelectionModel
(
Q_NULLPTR
)
mItemSelectionModel
(
nullptr
)
{
{
}
}
...
...
kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h
View file @
1ad74958
...
@@ -31,7 +31,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginInterface :
...
@@ -31,7 +31,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginInterface :
{
{
Q_OBJECT
Q_OBJECT
public:
public:
explicit
KAddressBookImportExportPluginInterface
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
KAddressBookImportExportPluginInterface
(
QObject
*
parent
=
nullptr
);
~
KAddressBookImportExportPluginInterface
();
~
KAddressBookImportExportPluginInterface
();
enum
ImportExportAction
{
enum
ImportExportAction
{
...
...
kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp
View file @
1ad74958
...
@@ -49,7 +49,7 @@ class KAddressBookImportExportInfo
...
@@ -49,7 +49,7 @@ class KAddressBookImportExportInfo
{
{
public:
public:
KAddressBookImportExportInfo
()
KAddressBookImportExportInfo
()
:
plugin
(
Q_NULLPTR
),
:
plugin
(
nullptr
),
isEnabled
(
true
)
isEnabled
(
true
)
{
{
...
@@ -120,7 +120,7 @@ bool KAddressBookImportExportPrivate::initializePlugins()
...
@@ -120,7 +120,7 @@ bool KAddressBookImportExportPrivate::initializePlugins()
if
(
unique
.
contains
(
info
.
metaDataFileNameBaseName
))
{
if
(
unique
.
contains
(
info
.
metaDataFileNameBaseName
))
{
continue
;
continue
;
}
}
info
.
plugin
=
Q_NULLPTR
;
info
.
plugin
=
nullptr
;
mPluginList
.
push_back
(
info
);
mPluginList
.
push_back
(
info
);
unique
.
insert
(
info
.
metaDataFileNameBaseName
);
unique
.
insert
(
info
.
metaDataFileNameBaseName
);
}
else
{
}
else
{
...
...
kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h
View file @
1ad74958
...
@@ -32,7 +32,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginManager : p
...
@@ -32,7 +32,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginManager : p
{
{
Q_OBJECT
Q_OBJECT
public:
public:
explicit
KAddressBookImportExportPluginManager
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
KAddressBookImportExportPluginManager
(
QObject
*
parent
=
nullptr
);
~
KAddressBookImportExportPluginManager
();
~
KAddressBookImportExportPluginManager
();
static
KAddressBookImportExportPluginManager
*
self
();
static
KAddressBookImportExportPluginManager
*
self
();
...
...
libsendlater/src/sendlaterdialog.cpp
View file @
1ad74958
...
@@ -36,7 +36,7 @@ using namespace SendLater;
...
@@ -36,7 +36,7 @@ using namespace SendLater;
SendLaterDialog
::
SendLaterDialog
(
SendLater
::
SendLaterInfo
*
info
,
QWidget
*
parent
)
SendLaterDialog
::
SendLaterDialog
(
SendLater
::
SendLaterInfo
*
info
,
QWidget
*
parent
)
:
QDialog
(
parent
),
:
QDialog
(
parent
),
mAction
(
Unknown
),
mAction
(
Unknown
),
mDelay
(
Q_NULLPTR
),
mDelay
(
nullptr
),
mInfo
(
info
)
mInfo
(
info
)
{
{
setWindowTitle
(
i18nc
(
"@title:window"
,
"Send Later"
));
setWindowTitle
(
i18nc
(
"@title:window"
,
"Send Later"
));
...
...
libsendlater/src/sendlaterdialog.h
View file @
1ad74958
...
@@ -44,7 +44,7 @@ public:
...
@@ -44,7 +44,7 @@ public:
PutInOutbox
=
3
PutInOutbox
=
3
};
};
explicit
SendLaterDialog
(
SendLater
::
SendLaterInfo
*
info
,
QWidget
*
parent
=
Q_NULLPTR
);
explicit
SendLaterDialog
(
SendLater
::
SendLaterInfo
*
info
,
QWidget
*
parent
=
nullptr
);
~
SendLaterDialog
();
~
SendLaterDialog
();
SendLater
::
SendLaterInfo
*
info
();
SendLater
::
SendLaterInfo
*
info
();
...
...
libsendlater/src/sendlatertimedatewidget.h
View file @
1ad74958
...
@@ -32,7 +32,7 @@ class SendLaterTimeDateWidget : public QWidget
...
@@ -32,7 +32,7 @@ class SendLaterTimeDateWidget : public QWidget
{
{
Q_OBJECT
Q_OBJECT
public:
public:
explicit
SendLaterTimeDateWidget
(
QWidget
*
parent
=
Q_NULLPTR
);
explicit
SendLaterTimeDateWidget
(
QWidget
*
parent
=
nullptr
);
~
SendLaterTimeDateWidget
();
~
SendLaterTimeDateWidget
();
void
setDateTime
(
const
QDateTime
&
);
void
setDateTime
(
const
QDateTime
&
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment