Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
KDE Pim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Unmaintained
KDE Pim
Commits
a2f1be5d
Commit
a2f1be5d
authored
Jul 06, 2015
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Astyle kdelibs
parent
1d0ce752
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
86 additions
and
76 deletions
+86
-76
agents/followupreminderagent/autotests/followupreminderinfodialogtest.cpp
...eminderagent/autotests/followupreminderinfodialogtest.cpp
+0
-1
agents/sendlateragent/autotests/sendlaterconfiguredialogtest.cpp
...sendlateragent/autotests/sendlaterconfiguredialogtest.cpp
+0
-2
blogilo/src/addeditblog.cpp
blogilo/src/addeditblog.cpp
+0
-1
blogilo/src/configuredialog.cpp
blogilo/src/configuredialog.cpp
+1
-1
blogilo/src/mainwindow.cpp
blogilo/src/mainwindow.cpp
+4
-4
calendarsupport/printing/calprintdefaultplugins.h
calendarsupport/printing/calprintdefaultplugins.h
+44
-22
calendarsupport/printing/journalprint.h
calendarsupport/printing/journalprint.h
+8
-4
calendarsupport/printing/yearprint.h
calendarsupport/printing/yearprint.h
+8
-4
calendarsupport/utils.cpp
calendarsupport/utils.cpp
+0
-1
calendarviews/agenda/agendaview.h
calendarviews/agenda/agendaview.h
+0
-1
calendarviews/todo/incidencetreemodel.h
calendarviews/todo/incidencetreemodel.h
+1
-1
importwizard/autodetect/thunderbird/thunderbirdsettings.cpp
importwizard/autodetect/thunderbird/thunderbirdsettings.cpp
+2
-1
knotes/kontactplugin/knotes_part.cpp
knotes/kontactplugin/knotes_part.cpp
+0
-1
knotes/notes/knotesmigrateapplication.h
knotes/notes/knotesmigrateapplication.h
+0
-1
libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
...stbaloocompletion/blacklistbalooemailcompletionwidget.cpp
+0
-1
libkdepim/addressline/completionorder/completionorderwidget.cpp
...pim/addressline/completionorder/completionorderwidget.cpp
+10
-15
libkdepim/misc/maillistdrag.h
libkdepim/misc/maillistdrag.h
+0
-1
libkleo/backends/qgpgme/threadedjobmixin.h
libkleo/backends/qgpgme/threadedjobmixin.h
+5
-7
libkpgp/kpgp_debug.h
libkpgp/kpgp_debug.h
+0
-1
messagecomposer/composer-ng/richtextcomposercontroler.h
messagecomposer/composer-ng/richtextcomposercontroler.h
+1
-1
messagecomposer/imagescaling/autotests/imagescalingtest.cpp
messagecomposer/imagescaling/autotests/imagescalingtest.cpp
+2
-4
pimsettingexporter/console/pimsettingexporterconsole.cpp
pimsettingexporter/console/pimsettingexporterconsole.cpp
+0
-1
No files found.
agents/followupreminderagent/autotests/followupreminderinfodialogtest.cpp
View file @
a2f1be5d
...
...
@@ -38,7 +38,6 @@ void FollowupReminderInfoDialogTest::initTestCase()
QStandardPaths
::
setTestModeEnabled
(
true
);
}
void
FollowupReminderInfoDialogTest
::
shouldHaveDefaultValues
()
{
FollowUpReminderInfoDialog
dlg
;
...
...
agents/sendlateragent/autotests/sendlaterconfiguredialogtest.cpp
View file @
a2f1be5d
...
...
@@ -39,8 +39,6 @@ void SendLaterConfigureDialogTest::initTestCase()
QStandardPaths
::
setTestModeEnabled
(
true
);
}
void
SendLaterConfigureDialogTest
::
shouldHaveDefaultValue
()
{
SendLaterConfigureDialog
dlg
;
...
...
blogilo/src/addeditblog.cpp
View file @
a2f1be5d
...
...
@@ -86,7 +86,6 @@ AddEditBlog::AddEditBlog(int blog_id, QWidget *parent, Qt::WindowFlags flags)
connect
(
buttonBox
,
&
QDialogButtonBox
::
accepted
,
this
,
&
AddEditBlog
::
slotAccepted
);
connect
(
buttonBox
,
&
QDialogButtonBox
::
rejected
,
this
,
&
AddEditBlog
::
reject
);
d
->
isNewBlog
=
true
;
d
->
mFetchAPITimer
=
d
->
mFetchBlogIdTimer
=
d
->
mFetchProfileIdTimer
=
Q_NULLPTR
;
...
...
blogilo/src/configuredialog.cpp
View file @
a2f1be5d
...
...
@@ -63,7 +63,7 @@ ConfigureDialog::ConfigureDialog(PimCommon::StorageServiceManager *storageManage
addPage
(
advancedSettingsDlg
,
i18nc
(
"Configure Page"
,
"Advanced"
),
QStringLiteral
(
"applications-utilities"
));
addPage
(
mConfigStorageService
,
i18nc
(
"Configure Page"
,
"Storage Service"
),
QStringLiteral
(
"applications-utilities"
));
connect
(
this
,
&
KConfigDialog
::
settingsChanged
,
this
,
&
ConfigureDialog
::
configurationChanged
);
connect
(
this
,
&
KConfigDialog
::
settingsChanged
,
this
,
&
ConfigureDialog
::
configurationChanged
);
connect
(
this
,
&
ConfigureDialog
::
destroyed
,
this
,
&
ConfigureDialog
::
dialogDestroyed
);
connect
(
button
(
QDialogButtonBox
::
Ok
),
&
QPushButton
::
clicked
,
this
,
&
ConfigureDialog
::
slotApplySettingsClicked
);
connect
(
button
(
QDialogButtonBox
::
RestoreDefaults
),
&
QPushButton
::
clicked
,
this
,
&
ConfigureDialog
::
slotDefaultClicked
);
...
...
blogilo/src/mainwindow.cpp
View file @
a2f1be5d
...
...
@@ -347,10 +347,10 @@ void MainWindow::optionsPreferences()
connect
(
dialog
,
&
ConfigureDialog
::
blogAdded
,
this
,
&
MainWindow
::
slotBlogAdded
);
connect
(
dialog
,
&
ConfigureDialog
::
blogEdited
,
this
,
&
MainWindow
::
slotBlogEdited
);
connect
(
dialog
,
&
ConfigureDialog
::
blogRemoved
,
this
,
&
MainWindow
::
slotBlogRemoved
);
connect
(
dialog
,
&
KConfigDialog
::
settingsChanged
,
this
,
&
MainWindow
::
settingsChanged
);
connect
(
dialog
,
&
KConfigDialog
::
settingsChanged
,
this
,
&
MainWindow
::
slotSettingsChanged
);
connect
(
dialog
,
&
ConfigureDialog
::
dialogDestroyed
,
this
,
&
MainWindow
::
slotDialogDestroyed
);
connect
(
dialog
,
&
ConfigureDialog
::
configurationChanged
,
this
,
&
MainWindow
::
slotSettingsChanged
);
connect
(
dialog
,
&
KConfigDialog
::
settingsChanged
,
this
,
&
MainWindow
::
settingsChanged
);
connect
(
dialog
,
&
KConfigDialog
::
settingsChanged
,
this
,
&
MainWindow
::
slotSettingsChanged
);
connect
(
dialog
,
&
ConfigureDialog
::
dialogDestroyed
,
this
,
&
MainWindow
::
slotDialogDestroyed
);
connect
(
dialog
,
&
ConfigureDialog
::
configurationChanged
,
this
,
&
MainWindow
::
slotSettingsChanged
);
dialog
->
show
();
}
...
...
calendarsupport/printing/calprintdefaultplugins.h
View file @
a2f1be5d
...
...
@@ -44,26 +44,31 @@ class CALENDARSUPPORT_EXPORT CalPrintIncidence : public CalPrintPluginBase
public:
CalPrintIncidence
();
virtual
~
CalPrintIncidence
();
QString
groupName
()
const
Q_DECL_OVERRIDE
{
QString
groupName
()
const
Q_DECL_OVERRIDE
{
return
QStringLiteral
(
"Print incidence"
);
}
QString
description
()
const
Q_DECL_OVERRIDE
{
QString
description
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Print &incidence"
);
}
QString
info
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Prints an incidence on one page"
);
}
int
sortID
()
const
Q_DECL_OVERRIDE
{
int
sortID
()
const
Q_DECL_OVERRIDE
{
return
CalPrinterBase
::
Incidence
;
}
// Enable the Print Incidence option only if there are selected incidences.
bool
enabled
()
const
Q_DECL_OVERRIDE
{
bool
enabled
()
const
Q_DECL_OVERRIDE
{
return
!
mSelectedIncidences
.
isEmpty
();
}
QWidget
*
createConfigWidget
(
QWidget
*
)
Q_DECL_OVERRIDE
;
QPrinter
::
Orientation
defaultOrientation
()
const
Q_DECL_OVERRIDE
{
QPrinter
::
Orientation
defaultOrientation
()
const
Q_DECL_OVERRIDE
{
return
QPrinter
::
Portrait
;
}
...
...
@@ -90,20 +95,24 @@ class CalPrintDay : public CalPrintPluginBase
public:
CalPrintDay
();
virtual
~
CalPrintDay
();
QString
groupName
()
const
Q_DECL_OVERRIDE
{
QString
groupName
()
const
Q_DECL_OVERRIDE
{
return
QStringLiteral
(
"Print day"
);
}
QString
description
()
const
Q_DECL_OVERRIDE
{
QString
description
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Print da&y"
);
}
QString
info
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Prints all events of a single day on one page"
);
}
int
sortID
()
const
Q_DECL_OVERRIDE
{
int
sortID
()
const
Q_DECL_OVERRIDE
{
return
CalPrinterBase
::
Day
;
}
bool
enabled
()
const
Q_DECL_OVERRIDE
{
bool
enabled
()
const
Q_DECL_OVERRIDE
{
return
true
;
}
QWidget
*
createConfigWidget
(
QWidget
*
)
Q_DECL_OVERRIDE
;
...
...
@@ -138,20 +147,24 @@ public:
CalPrintWeek
();
virtual
~
CalPrintWeek
();
QString
groupName
()
const
Q_DECL_OVERRIDE
{
QString
groupName
()
const
Q_DECL_OVERRIDE
{
return
QStringLiteral
(
"Print week"
);
}
QString
description
()
const
Q_DECL_OVERRIDE
{
QString
description
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Print &week"
);
}
QString
info
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Prints all events of one week on one page"
);
}
int
sortID
()
const
Q_DECL_OVERRIDE
{
int
sortID
()
const
Q_DECL_OVERRIDE
{
return
CalPrinterBase
::
Week
;
}
bool
enabled
()
const
Q_DECL_OVERRIDE
{
bool
enabled
()
const
Q_DECL_OVERRIDE
{
return
true
;
}
QWidget
*
createConfigWidget
(
QWidget
*
)
Q_DECL_OVERRIDE
;
...
...
@@ -189,24 +202,29 @@ class CalPrintMonth : public CalPrintPluginBase
public:
CalPrintMonth
();
virtual
~
CalPrintMonth
();
QString
groupName
()
const
Q_DECL_OVERRIDE
{
QString
groupName
()
const
Q_DECL_OVERRIDE
{
return
QStringLiteral
(
"Print month"
);
}
QString
description
()
const
Q_DECL_OVERRIDE
{
QString
description
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Print mont&h"
);
}
QString
info
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Prints all events of one month on one page"
);
}
int
sortID
()
const
Q_DECL_OVERRIDE
{
int
sortID
()
const
Q_DECL_OVERRIDE
{
return
CalPrinterBase
::
Month
;
}
bool
enabled
()
const
Q_DECL_OVERRIDE
{
bool
enabled
()
const
Q_DECL_OVERRIDE
{
return
true
;
}
QWidget
*
createConfigWidget
(
QWidget
*
)
Q_DECL_OVERRIDE
;
QPrinter
::
Orientation
defaultOrientation
()
const
Q_DECL_OVERRIDE
{
QPrinter
::
Orientation
defaultOrientation
()
const
Q_DECL_OVERRIDE
{
return
QPrinter
::
Landscape
;
}
...
...
@@ -235,20 +253,24 @@ public:
CalPrintTodos
();
virtual
~
CalPrintTodos
();
QString
groupName
()
const
Q_DECL_OVERRIDE
{
QString
groupName
()
const
Q_DECL_OVERRIDE
{
return
QStringLiteral
(
"Print to-dos"
);
}
QString
description
()
const
Q_DECL_OVERRIDE
{
QString
description
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Print to-&dos"
);
}
QString
info
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Prints all to-dos in a (tree-like) list"
);
}
int
sortID
()
const
Q_DECL_OVERRIDE
{
int
sortID
()
const
Q_DECL_OVERRIDE
{
return
CalPrinterBase
::
Todolist
;
}
bool
enabled
()
const
Q_DECL_OVERRIDE
{
bool
enabled
()
const
Q_DECL_OVERRIDE
{
return
true
;
}
QWidget
*
createConfigWidget
(
QWidget
*
)
Q_DECL_OVERRIDE
;
...
...
calendarsupport/printing/journalprint.h
View file @
a2f1be5d
...
...
@@ -36,10 +36,12 @@ public:
CalPrintJournal
()
:
CalPrintPluginBase
()
{}
~
CalPrintJournal
()
{}
QString
groupName
()
const
Q_DECL_OVERRIDE
{
QString
groupName
()
const
Q_DECL_OVERRIDE
{
return
QStringLiteral
(
"Print journal"
);
}
QString
description
()
const
Q_DECL_OVERRIDE
{
QString
description
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Print &journal"
);
}
QString
info
()
const
Q_DECL_OVERRIDE
...
...
@@ -47,10 +49,12 @@ public:
return
i18n
(
"Prints all journals for a given date range"
);
}
QWidget
*
createConfigWidget
(
QWidget
*
)
Q_DECL_OVERRIDE
;
int
sortID
()
const
Q_DECL_OVERRIDE
{
int
sortID
()
const
Q_DECL_OVERRIDE
{
return
CalPrinterBase
::
Journallist
;
}
bool
enabled
()
const
Q_DECL_OVERRIDE
{
bool
enabled
()
const
Q_DECL_OVERRIDE
{
return
true
;
}
...
...
calendarsupport/printing/yearprint.h
View file @
a2f1be5d
...
...
@@ -35,20 +35,24 @@ class CALENDARSUPPORT_EXPORT CalPrintYear : public CalPrintPluginBase
public:
CalPrintYear
()
:
CalPrintPluginBase
()
{}
~
CalPrintYear
()
{}
QString
groupName
()
const
Q_DECL_OVERRIDE
{
QString
groupName
()
const
Q_DECL_OVERRIDE
{
return
QStringLiteral
(
"Print year"
);
}
QString
description
()
const
Q_DECL_OVERRIDE
{
QString
description
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Print &year"
);
}
QString
info
()
const
Q_DECL_OVERRIDE
{
return
i18n
(
"Prints a calendar for an entire year"
);
}
int
sortID
()
const
Q_DECL_OVERRIDE
{
int
sortID
()
const
Q_DECL_OVERRIDE
{
return
CalPrinterBase
::
Year
;
}
bool
enabled
()
const
Q_DECL_OVERRIDE
{
bool
enabled
()
const
Q_DECL_OVERRIDE
{
return
true
;
}
QWidget
*
createConfigWidget
(
QWidget
*
)
Q_DECL_OVERRIDE
;
...
...
calendarsupport/utils.cpp
View file @
a2f1be5d
...
...
@@ -51,7 +51,6 @@
#include <KCalUtils/ICalDrag>
#include <KCalUtils/VCalDrag>
#include <QUrl>
#include <KIconLoader>
...
...
calendarviews/agenda/agendaview.h
View file @
a2f1be5d
...
...
@@ -178,7 +178,6 @@ public:
void
readSettings
(
const
KConfig
*
);
void
writeSettings
(
KConfig
*
);
void
enableAgendaUpdate
(
bool
enable
);
void
setIncidenceChanger
(
Akonadi
::
IncidenceChanger
*
changer
)
Q_DECL_OVERRIDE
;
...
...
calendarviews/todo/incidencetreemodel.h
View file @
a2f1be5d
...
...
@@ -56,7 +56,7 @@ public:
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
Q_DECL_OVERRIDE
;
QModelIndex
index
(
int
row
,
int
column
,
const
QModelIndex
&
parent
=
QModelIndex
())
const
Q_DECL_OVERRIDE
;
const
QModelIndex
&
parent
=
QModelIndex
())
const
Q_DECL_OVERRIDE
;
QModelIndex
mapFromSource
(
const
QModelIndex
&
sourceIndex
)
const
Q_DECL_OVERRIDE
;
QModelIndex
mapToSource
(
const
QModelIndex
&
proxyIndex
)
const
Q_DECL_OVERRIDE
;
...
...
importwizard/autodetect/thunderbird/thunderbirdsettings.cpp
View file @
a2f1be5d
...
...
@@ -271,8 +271,9 @@ void ThunderbirdSettings::readTagSettings()
{
QVector
<
tagStruct
>
v
;
v
.
reserve
(
mHashTag
.
size
());
foreach
(
const
tagStruct
&
tag
,
mHashTag
)
foreach
(
const
tagStruct
&
tag
,
mHashTag
)
{
v
.
push_back
(
tag
);
}
ImportWizardUtil
::
addAkonadiTag
(
v
);
}
...
...
knotes/kontactplugin/knotes_part.cpp
View file @
a2f1be5d
...
...
@@ -106,7 +106,6 @@ KNotesPart::KNotesPart(QObject *parent)
Akonadi
::
ControlGui
::
widgetNeedsAkonadi
(
widget
());
if
(
KNotesGlobalConfig
::
self
()
->
autoCreateResourceOnStart
())
{
NoteShared
::
LocalResourceCreator
*
creator
=
new
NoteShared
::
LocalResourceCreator
(
this
);
creator
->
createIfMissing
();
...
...
knotes/notes/knotesmigrateapplication.h
View file @
a2f1be5d
...
...
@@ -23,7 +23,6 @@
#include <migration/migrateapplicationfiles.h>
#include "knotes_export.h"
class
KNOTES_EXPORT
KNotesMigrateApplication
{
public:
...
...
libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
View file @
a2f1be5d
...
...
@@ -67,7 +67,6 @@ BlackListBalooEmailCompletionWidget::BlackListBalooEmailCompletionWidget(QWidget
mEmailList
->
setObjectName
(
QStringLiteral
(
"email_list"
));
mainLayout
->
addWidget
(
mEmailList
);
QHBoxLayout
*
searchLineLayout
=
new
QHBoxLayout
;
mainLayout
->
addLayout
(
searchLineLayout
);
mSearchInResultLineEdit
=
new
KListWidgetSearchLine
(
this
,
mEmailList
);
...
...
libkdepim/addressline/completionorder/completionorderwidget.cpp
View file @
a2f1be5d
...
...
@@ -76,12 +76,11 @@ public:
return
mWeight
;
}
void
save
(
CompletionOrderWidget
*
)
Q_DECL_OVERRIDE
{
void
save
(
CompletionOrderWidget
*
)
Q_DECL_OVERRIDE
{
KConfig
*
config
=
KLDAP
::
LdapClientSearchConfig
::
config
();
KConfigGroup
group
(
config
,
"LDAP"
);
group
.
writeEntry
(
QString
::
fromLatin1
(
"SelectedCompletionWeight%1"
).
arg
(
mLdapClient
->
clientNumber
()),
mWeight
);
mWeight
);
group
.
sync
();
}
...
...
@@ -95,14 +94,12 @@ public:
return
true
;
}
void
setIsEnabled
(
bool
b
)
Q_DECL_OVERRIDE
{
void
setIsEnabled
(
bool
b
)
Q_DECL_OVERRIDE
{
Q_UNUSED
(
b
);
}
protected:
void
setCompletionWeight
(
int
weight
)
Q_DECL_OVERRIDE
{
void
setCompletionWeight
(
int
weight
)
Q_DECL_OVERRIDE
{
mWeight
=
weight
;
}
...
...
@@ -155,24 +152,22 @@ public:
return
mWeight
;
}
void
setIsEnabled
(
bool
b
)
Q_DECL_OVERRIDE
{
void
setIsEnabled
(
bool
b
)
Q_DECL_OVERRIDE
{
mEnabled
=
b
;
}
void
save
(
CompletionOrderWidget
*
editor
)
Q_DECL_OVERRIDE
{
void
save
(
CompletionOrderWidget
*
editor
)
Q_DECL_OVERRIDE
{
KConfigGroup
group
(
editor
->
configFile
(),
"CompletionWeights"
);
group
.
writeEntry
(
mIdentifier
,
mWeight
);
if
(
mHasEnableSupport
)
{
if
(
mHasEnableSupport
)
{
KConfigGroup
groupEnabled
(
editor
->
configFile
(),
"CompletionEnabled"
);
//groupEnabled.writeEntry(mIdentifier, );
}
}
protected:
void
setCompletionWeight
(
int
weight
)
Q_DECL_OVERRIDE
{
void
setCompletionWeight
(
int
weight
)
Q_DECL_OVERRIDE
{
mWeight
=
weight
;
}
...
...
@@ -205,7 +200,7 @@ public:
setFlags
(
flags
()
|
Qt
::
ItemIsUserCheckable
);
setCheckState
(
0
,
mItem
->
isEnabled
()
?
Qt
::
Checked
:
Qt
::
Unchecked
);
}
else
{
setFlags
(
flags
()
&~
Qt
::
ItemIsUserCheckable
);
setFlags
(
flags
()
&
~
Qt
::
ItemIsUserCheckable
);
}
}
...
...
libkdepim/misc/maillistdrag.h
View file @
a2f1be5d
...
...
@@ -32,7 +32,6 @@
#include <time.h>
namespace
KPIM
{
...
...
libkleo/backends/qgpgme/threadedjobmixin.h
View file @
a2f1be5d
...
...
@@ -110,8 +110,7 @@ public:
}
private:
void
run
()
Q_DECL_OVERRIDE
{
void
run
()
Q_DECL_OVERRIDE
{
const
QMutexLocker
locker
(
&
m_mutex
);
m_result
=
m_function
();
}
...
...
@@ -228,16 +227,15 @@ protected:
{
return
m_auditLogError
;
}
void
showProgress
(
const
char
*
what
,
int
type
,
int
current
,
int
total
)
Q_DECL_OVERRIDE
{
void
showProgress
(
const
char
*
what
,
int
type
,
int
current
,
int
total
)
Q_DECL_OVERRIDE
{
// will be called from the thread exec'ing the operation, so
// just bounce everything to the owning thread:
// ### hope this is thread-safe (meta obj is const, and
// ### portEvent is thread-safe, so should be ok)
QMetaObject
::
invokeMethod
(
this
,
"progress"
,
Qt
::
QueuedConnection
,
Q_ARG
(
QString
,
QGpgMEProgressTokenMapper
::
map
(
what
,
type
)),
Q_ARG
(
int
,
current
),
Q_ARG
(
int
,
total
));
Q_ARG
(
QString
,
QGpgMEProgressTokenMapper
::
map
(
what
,
type
)),
Q_ARG
(
int
,
current
),
Q_ARG
(
int
,
total
));
}
private:
template
<
typename
T1
,
typename
T2
>
...
...
libkpgp/kpgp_debug.h
View file @
a2f1be5d
...
...
@@ -17,7 +17,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef KPGP_DEBUG_H
#define KPGP_DEBUG_H
...
...
messagecomposer/composer-ng/richtextcomposercontroler.h
View file @
a2f1be5d
...
...
@@ -96,7 +96,7 @@ public Q_SLOTS:
void
slotRemoveQuotes
();
void
slotAddQuotes
();
void
slotAddImage
();
void
slotFormatPainter
(
bool
active
);
void
slotFormatPainter
(
bool
active
);
void
ensureCursorVisibleDelayed
();
private:
class
RichTextComposerControlerPrivate
;
...
...
messagecomposer/imagescaling/autotests/imagescalingtest.cpp
View file @
a2f1be5d
...
...
@@ -37,7 +37,6 @@ void ImageScalingTest::initTestCase()
QStandardPaths
::
setTestModeEnabled
(
true
);
}
void
ImageScalingTest
::
shouldHaveDefaultValue
()
{
MessageComposer
::
ImageScaling
scaling
;
...
...
@@ -89,7 +88,6 @@ void ImageScalingTest::shouldHaveChangeMimetype_data()
QTest
::
newRow
(
"no change mimetype when png (same)"
)
<<
QByteArray
(
"image/png"
)
<<
QByteArray
(
"image/png"
)
<<
QStringLiteral
(
"JPG"
);
QTest
::
newRow
(
"no change mimetype when png"
)
<<
QByteArray
(
"image/png"
)
<<
QByteArray
(
"image/png"
)
<<
QStringLiteral
(
"PNG"
);
QTest
::
newRow
(
"change mimetype when png"
)
<<
QByteArray
(
"image/mng"
)
<<
QByteArray
(
"image/png"
)
<<
QStringLiteral
(
"PNG"
);
QTest
::
newRow
(
"change mimetype when jpeg"
)
<<
QByteArray
(
"image/mng"
)
<<
QByteArray
(
"image/jpeg"
)
<<
QStringLiteral
(
"JPG"
);
...
...
@@ -109,8 +107,8 @@ void ImageScalingTest::shouldHaveChangeMimetype()
MessageComposer
::
MessageComposerSettings
::
self
()
->
save
();
MessageComposer
::
ImageScaling
scaling
;
scaling
.
setMimetype
(
initialmimetype
);
qDebug
()
<<
" scaling.mimetype()"
<<
scaling
.
mimetype
();
qDebug
()
<<
" scaling.mimetype()"
<<
newmimetype
;
qDebug
()
<<
" scaling.mimetype()"
<<
scaling
.
mimetype
();
qDebug
()
<<
" scaling.mimetype()"
<<
newmimetype
;
QCOMPARE
(
scaling
.
mimetype
(),
newmimetype
);
}
...
...
pimsettingexporter/console/pimsettingexporterconsole.cpp
View file @
a2f1be5d
...
...
@@ -46,7 +46,6 @@ void PimSettingExporterConsole::initializeLogInFile()
connect
(
mPimSettingsBackupRestore
,
&
PimSettingsBackupRestore
::
addTitle
,
this
,
&
PimSettingExporterConsole
::
slotAddTitle
);
}
void
PimSettingExporterConsole
::
slotAddEndLine
()
{
mLogInFile
->
addEndLine
();
...
...
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