Montel Laurent
|
b0bd84c027
|
Show where we need to port to qt5
|
11 years ago |
Montel Laurent
|
d75f375795
|
Astyle kdelibs
|
11 years ago |
Montel Laurent
|
9531ddc5b5
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
messagecomposer/composer/composerviewbase.cpp
messagecore/utils/stringutil.cpp
|
11 years ago |
Montel Laurent
|
58a86097a2
|
Use dictionary code and not translated dictionary name.
|
11 years ago |
Montel Laurent
|
7023be198e
|
Update aboutdata copyright
|
11 years ago |
Montel Laurent
|
96415b3a70
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
akregator/src/speechclient.cpp
blogilo/src/composer/bilbobrowser.h
kmail/editor/kmcomposereditor.cpp
messagecore/widgets/annotationdialog.cpp
plugins/messageviewer/bodypartformatter/delegateselector.cpp
plugins/messageviewer/bodypartformatter/text_vcard.cpp
|
11 years ago |
Montel Laurent
|
cb52bdf5ec
|
Copyright update
|
11 years ago |
Montel Laurent
|
e2c9680a40
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
agents/archivemailagent/archivejob.h
agents/archivemailagent/archivemailagentutil.cpp
agents/archivemailagent/archivemailagentutil.h
composereditor-ng/image/composerimagedialog.h
importwizard/abstractbase.cpp
importwizard/abstractbase.h
importwizard/abstractcalendar.cpp
importwizard/abstractcalendar.h
importwizard/balsa/balsaaddressbook.cpp
importwizard/balsa/balsaaddressbook.h
importwizard/balsa/balsasettings.cpp
importwizard/balsa/balsasettings.h
importwizard/claws-mail/clawsmailaddressbook.cpp
importwizard/claws-mail/clawsmailaddressbook.h
importwizard/claws-mail/clawsmailsettings.cpp
importwizard/claws-mail/clawsmailsettings.h
importwizard/evolutionv3/evolutioncalendar.cpp
importwizard/evolutionv3/evolutioncalendar.h
importwizard/evolutionv3/evolutionutil.cpp
importwizard/evolutionv3/evolutionutil.h
importwizard/importwizardutil.cpp
importwizard/importwizardutil.h
importwizard/opera/operaaddressbook.cpp
importwizard/opera/operaaddressbook.h
importwizard/opera/operasettings.h
importwizard/pmail/pmailsettings.cpp
importwizard/pmail/pmailsettings.h
importwizard/sylpheed/sylpheedsettingsutils.cpp
importwizard/sylpheed/sylpheedsettingsutils.h
importwizard/thunderbird/thunderbirdaddressbook.cpp
importwizard/thunderbird/thunderbirdaddressbook.h
importwizard/trojita/trojitasettings.cpp
importwizard/trojita/trojitasettings.h
kjots/kcm_kjots.cpp
kjots/kjotsconfigdlg.cpp
kjots/kjotsconfigdlg.h
kmail/identity/identityaddvcarddialog.cpp
kmail/identity/identityaddvcarddialog.h
kmail/identity/identityeditvcarddialog.cpp
kmail/identity/identityeditvcarddialog.h
kmail/warningwidgets/attachmentmissingwarning.cpp
kmail/warningwidgets/attachmentmissingwarning.h
mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.h
mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.cpp
mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h
mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
mailcommon/tag/addtagdialog.cpp
mailcommon/tag/addtagdialog.h
mailcommon/tag/tagwidget.cpp
mailcommon/tag/tagwidget.h
mailimporter/filterbalsa.cpp
mailimporter/filterbalsa.h
mailimporter/filterinfo.h
mailimporter/selectthunderbirdprofilewidget.cpp
mailimporter/selectthunderbirdprofilewidget.h
pimcommon/autocorrection/autocorrectionlistwidget.cpp
pimcommon/autocorrection/autocorrectionlistwidget.h
pimcommon/autocorrection/autocorrectiontreewidget.cpp
pimcommon/autocorrection/autocorrectiontreewidget.h
pimcommon/autocorrection/autocorrectionwidget.cpp
pimcommon/autocorrection/autocorrectionwidget.h
pimcommon/autocorrection/import/importabstractautocorrection.cpp
pimcommon/autocorrection/import/importabstractautocorrection.h
pimcommon/autocorrection/import/importkmailautocorrection.cpp
pimcommon/autocorrection/import/importkmailautocorrection.h
pimcommon/autocorrection/import/importlibreofficeautocorrection.cpp
pimcommon/autocorrection/import/importlibreofficeautocorrection.h
pimcommon/translator/abstracttranslator.cpp
pimcommon/translator/googletranslator.cpp
pimcommon/translator/googletranslator.h
pimcommon/translator/translatorutil.cpp
pimcommon/translator/translatorutil.h
pimcommon/util/createresource.cpp
pimcommon/util/createresource.h
pimsettingexporter/abstractimportexportjob.cpp
pimsettingexporter/abstractimportexportjob.h
pimsettingexporter/addressbook/exportaddressbookjob.cpp
pimsettingexporter/akonadidatabase.h
pimsettingexporter/alarm/exportalarmjob.cpp
pimsettingexporter/alarm/exportalarmjob.h
pimsettingexporter/alarm/importalarmjob.cpp
pimsettingexporter/alarm/importalarmjob.h
pimsettingexporter/archivestorage.cpp
pimsettingexporter/archivestorage.h
pimsettingexporter/calendar/exportcalendarjob.h
pimsettingexporter/calendar/importcalendarjob.h
pimsettingexporter/dialog/selectiontypedialog.cpp
pimsettingexporter/dialog/selectiontypedialog.h
pimsettingexporter/jot/exportjotjob.cpp
pimsettingexporter/jot/exportjotjob.h
pimsettingexporter/jot/importjotjob.cpp
pimsettingexporter/jot/importjotjob.h
pimsettingexporter/utils.cpp
plugins/messageviewer/bodypartformatter/updatecontactjob.cpp
plugins/messageviewer/bodypartformatter/vcard/updatecontactjob.h
plugins/messageviewer/bodypartformatter/vcardmemento.cpp
|
11 years ago |
Montel Laurent
|
c756e7f471
|
Update copyright
|
11 years ago |
Montel Laurent
|
72b79e1aca
|
update copyright
|
11 years ago |
Montel Laurent
|
e0fe4260db
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
agents/mailfilteragent/autotests/pop3resourceattributetest.cpp
mailcommon/collectionpage/autotests/newmailnotifierattributetest.cpp
mailcommon/collectionpage/autotests/newmailnotifierattributetest.h
messagelist/core/quicksearchline.cpp
pimcommon/storageservice/gdrive/gdrivestorageservice.cpp
pimcommon/widgets/splittercollapser.cpp
pimcommon/widgets/splittercollapser.h
pimcommon/widgets/tests/splittercollapsergui_test.cpp
pimcommon/widgets/tests/splittercollapsergui_test.h
pimcommon/widgets/tests/splittercollapsertest.cpp
pimcommon/widgets/tests/splittercollapsertest.h
|
11 years ago |
Montel Laurent
|
39124dea4f
|
Fix copyright
|
11 years ago |
Montel Laurent
|
b2704f0a50
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
agents/mailfilteragent/pop3resourceattribute.cpp
agents/mailfilteragent/pop3resourceattribute.h
importwizard/kmail1/kmail1importdata.cpp
importwizard/kmail1/kmail1importdata.h
importwizard/kmail1/kmail1settings.cpp
importwizard/kmail1/kmail1settings.h
knotes/tests/apps/knoteakonadinote.cpp
knotes/tests/apps/knoteakonadinote.h
knotes/tests/apps/knotesakonadiapp.cpp
knotes/tests/apps/knotesakonadiapp.h
knotes/tests/apps/knotesakonaditray.cpp
knotes/tests/apps/knotesakonaditray.h
knotes/tests/apps/main.cpp
mailcommon/collectionpage/newmailnotifierattribute.cpp
mailcommon/collectionpage/newmailnotifierattribute.h
pimsettingexporter/addressbook/exportaddressbookjob.h
pimsettingexporter/addressbook/importaddressbookjob.cpp
pimsettingexporter/addressbook/importaddressbookjob.h
pimsettingexporter/akregator/exportakregatorjob.cpp
pimsettingexporter/akregator/exportakregatorjob.h
pimsettingexporter/akregator/importakregatorjob.cpp
pimsettingexporter/akregator/importakregatorjob.h
pimsettingexporter/blogilo/exportblogilojob.cpp
pimsettingexporter/blogilo/exportblogilojob.h
pimsettingexporter/blogilo/importblogilojob.cpp
pimsettingexporter/blogilo/importblogilojob.h
pimsettingexporter/knode/exportknodejob.cpp
pimsettingexporter/knode/exportknodejob.h
pimsettingexporter/knode/importknodejob.cpp
pimsettingexporter/knode/importknodejob.h
pimsettingexporter/notes/exportnotesjob.cpp
pimsettingexporter/notes/exportnotesjob.h
pimsettingexporter/notes/importnotesjob.cpp
pimsettingexporter/notes/importnotesjob.h
|
11 years ago |
Montel Laurent
|
95b704e4f3
|
Update copyright
|
11 years ago |
Montel Laurent
|
c090c5231f
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
messagecomposer/autotests/composerviewbasetest.cpp
templateparser/tests/templateparsertest.cpp
|
11 years ago |
Montel Laurent
|
280b25040c
|
Minor
|
11 years ago |
Montel Laurent
|
2d7890f1fa
|
Astyle kdelibs
|
11 years ago |
Montel Laurent
|
5e9f6006d6
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
kmail/editor/kmcomposewin.h
messagecomposer/composer/composerviewbase.cpp
messagecomposer/composer/composerviewbase.h
messagecomposer/tests/CMakeLists.txt
messagecore/utils/stringutil.cpp
|
11 years ago |
Montel Laurent
|
758bad95b7
|
Move sonnect::dictionary to composerviewbase. Start to create autotest
|
11 years ago |
Montel Laurent
|
71c56a0900
|
Start to save current spell checker. So when we reedit we can use same spell checker
which can be different from spell checker defined in identity
|
11 years ago |
l10n daemon script
|
489792086d
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
Montel Laurent
|
4133eb5b42
|
Remove duplicate code
|
11 years ago |
Montel Laurent
|
820ac13972
|
Use Q_NULLPTR
|
11 years ago |
Montel Laurent
|
16569e620a
|
Add more Q_DECL_OVERRIDE
|
11 years ago |
Montel Laurent
|
e8323065d2
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/foldershortcutactionmanager.h
mailcommon/filter/itemcontext.cpp
pimsettingexporter/mail/importmailjob.h
|
11 years ago |
Montel Laurent
|
67ddc30369
|
Use QHash
|
11 years ago |
Montel Laurent
|
d5b5f54e1e
|
Use QStringLiteral
|
11 years ago |
Montel Laurent
|
9a6e681c8b
|
Use Q_DECL_OVERRIDE
|
11 years ago |
Montel Laurent
|
e1860c5aeb
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.cpp
mailcommon/filter/filteractions/filteraction.h
mailcommon/filter/filterimporter/filterimporterabstract.cpp
mailcommon/filter/kmfilterlistbox.cpp
messageviewer/adblock/adblocksyntaxhighlighter.cpp
mobile/mail/mainview.cpp
pimcommon/syntaxhighlighter/syntaxhighlighterbase.h
templateparser/templatessyntaxhighlighter.cpp
|
11 years ago |
Montel Laurent
|
274012b771
|
Use Q_DECL_OVERRIDE Q_NULLPTR
|
11 years ago |
Montel Laurent
|
d9ded0b486
|
Make it compile
|
11 years ago |
Montel Laurent
|
b8bba86b8a
|
Astyle kdelibs
|
11 years ago |
Montel Laurent
|
a1e6e13364
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
messageviewer/viewer/viewer_p.cpp
|
11 years ago |
Montel Laurent
|
fd32c2f567
|
Use Q_DECL_OVERRIDE
|
11 years ago |
Montel Laurent
|
1cf48f1cda
|
Fix method name
|
11 years ago |
Montel Laurent
|
e0e7876383
|
Add more Q_DECL_OVERRIDE
|
11 years ago |
Montel Laurent
|
dcc92f1652
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/configuredialog/configuresecuritypage.cpp
kmail/editor/kmcomposewin.cpp
kmail/kmlaunchexternalcomponent.cpp
kmail/kmmainwidget.cpp
kmail/util.cpp
kmail/util.h
|
11 years ago |
Montel Laurent
|
f468bcf30d
|
Remove dead code
|
11 years ago |
Montel Laurent
|
a697032740
|
Disable this action which was not implemented in kmail akonadi
CCBUG: 341920
|
11 years ago |
Montel Laurent
|
f047ba7fdd
|
Clean up
|
11 years ago |
Montel Laurent
|
2833b913ef
|
not necessary to put in a static method
|
11 years ago |
Montel Laurent
|
8111e8cbeb
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/configuredialog/configuresecuritypage.cpp
messagecomposer/tests/composertest.cpp
|
11 years ago |
Montel Laurent
|
e49dc5e2e9
|
Add more Q_DECL_OVERRID
|
11 years ago |
Montel Laurent
|
9439bcdb0a
|
Remove this option. It was hidden in version < 4.4 and never implemented => remove it
|
11 years ago |
Montel Laurent
|
5b75c1e7b7
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
messagecomposer/composer/composerviewbase.cpp
messagecomposer/composer/composerviewbase.h
messagecomposer/job/savecontactpreferencejob.cpp
messagecomposer/job/savecontactpreferencejob.h
messagecomposer/job/signjob.h
messageviewer/viewer/viewer_p.cpp
|
11 years ago |
Montel Laurent
|
d7beed83d8
|
merge 2 methods
|
11 years ago |
Montel Laurent
|
4c4b73306e
|
Port to qDebug
|
11 years ago |
Montel Laurent
|
0a38973fd0
|
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kmail/editor/kmcomposewin.cpp
libkdepim/widgets/kwidgetlister.cpp
messagecore/tests/stringutiltest.cpp
messagecore/utils/stringutil.cpp
messageviewer/viewer/viewer_p.cpp
|
11 years ago |
Montel Laurent
|
256a32b7a9
|
Clean up
|
11 years ago |
Montel Laurent
|
682250c3d6
|
not necessary to assign here. Not used after that
|
11 years ago |