Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kaddressbook/merge/searchduplicate/resultduplicatetreewidget.cpp
	kaddressbook/merge/searchduplicate/resultduplicatetreewidget.h
	kmail/mailmerge/autotests/mailmergewidgettest.cpp
	kmail/mailmerge/mailmergedialog.cpp
	kmail/mailmerge/mailmergedialog.h
	kmail/mailmerge/tests/CMakeLists.txt
	kmail/mailmerge/widgets/attachmentlistwidget.cpp
	kmail/mailmerge/widgets/attachmentlistwidget.h

CMakeLists.txt

@@ -152,8 +152,9 @@ if (KDEPIM_BUILD_DESKTOP)
      dialog/kmknotify.cpp
   )
   set(kmailprivate_mailmerge_LIB_SRCS
-     mailmerge/mailmergewidget.cpp
-     mailmerge/attachmentlistwidget.cpp
+     mailmerge/widgets/mailmergewidget.cpp
+     mailmerge/widgets/attachmentlistwidget.cpp
+     mailmerge/widgets/addressbookwidget.cpp
      mailmerge/mailmergedialog.cpp
   )
 

mailmerge/autotests/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories(
 )
 # convenience macro to add qtest unit tests
 macro(add_kmail_unittest _source)
-  set(_test ${_source} ../mailmergewidget.cpp ../attachmentlistwidget.cpp)
+  set(_test ${_source} ../widgets/mailmergewidget.cpp ../widgets/attachmentlistwidget.cpp)
   get_filename_component(_name ${_source} NAME_WE)
   add_executable( ${_name} ${_test} )
   add_test( ${_name} ${_name} )

mailmerge/autotests/mailmergewidgettest.cpp

@@ -16,13 +16,14 @@
 */
 
 #include "mailmergewidgettest.h"
-#include "../mailmergewidget.h"
+#include "../widgets/mailmergewidget.h"
 #include "pimcommon/widgets/simplestringlisteditor.h"
 #include <qtest.h>
 #include <KComboBox>
 #include <QStackedWidget>
 #include <QSignalSpy>
-Q_DECLARE_METATYPE(MailMergeWidget::SourceType)
+using namespace MailMerge;
+Q_DECLARE_METATYPE(MailMerge::MailMergeWidget::SourceType)
 MailMergeWidgetTest::MailMergeWidgetTest()
 {
     qRegisterMetaType<MailMergeWidget::SourceType>();
@@ -56,7 +57,7 @@ void MailMergeWidgetTest::shouldEmitSourceModeChanged()
     MailMergeWidget mailmerge;
     KComboBox *source = mailmerge.findChild<KComboBox *>(QStringLiteral("source"));
     QCOMPARE(source->currentIndex(), 0);
-    QSignalSpy spy(&mailmerge, SIGNAL(sourceModeChanged(MailMergeWidget::SourceType)));
+    QSignalSpy spy(&mailmerge, SIGNAL(sourceModeChanged(MailMerge::MailMergeWidget::SourceType)));
     source->setCurrentIndex(1);
     QCOMPARE(spy.count(), 1);
 }
@@ -66,7 +67,7 @@ void MailMergeWidgetTest::shouldDontEmitSourceModeChangedWhenIndexIsInvalid()
     MailMergeWidget mailmerge;
     KComboBox *source = mailmerge.findChild<KComboBox *>(QStringLiteral("source"));
     QCOMPARE(source->currentIndex(), 0);
-    QSignalSpy spy(&mailmerge, SIGNAL(sourceModeChanged(MailMergeWidget::SourceType)));
+    QSignalSpy spy(&mailmerge, SIGNAL(sourceModeChanged(MailMerge::MailMergeWidget::SourceType)));
     source->setCurrentIndex(-1);
     QCOMPARE(spy.count(), 0);
 }

mailmerge/mailmergedialog.cpp

@@ -23,6 +23,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
+using namespace MailMerge;
 MailMergeDialog::MailMergeDialog(QWidget *parent)
     : QDialog(parent)
 {

mailmerge/mailmergedialog.h

@@ -18,7 +18,7 @@
 #ifndef MAILMERGEDIALOG_H
 #define MAILMERGEDIALOG_H
 #include <QDialog>
-
+namespace MailMerge {
 class MailMergeDialog : public QDialog
 {
     Q_OBJECT
@@ -26,5 +26,6 @@ public:
     explicit MailMergeDialog(QWidget *parent = 0);
     ~MailMergeDialog();
 };
+}
 
 #endif // MAILMERGEDIALOG_H

mailmerge/tests/CMakeLists.txt

@@ -1,7 +1,7 @@
 include_directories(
   ${CMAKE_SOURCE_DIR}/kmail/mailmerge
 )
-set(mailmergewidget_gui_SRCS mailmergewidgettest_gui.cpp ../mailmergewidget.cpp ../attachmentlistwidget.cpp)
+set(mailmergewidget_gui_SRCS mailmergewidgettest_gui.cpp ../widgets/mailmergewidget.cpp ../widgets/attachmentlistwidget.cpp)
 add_executable(mailmergewidget_gui ${mailmergewidget_gui_SRCS})
 target_link_libraries(mailmergewidget_gui
   KF5::KIOCore

mailmerge/tests/mailmergewidgettest_gui.cpp

@@ -15,7 +15,7 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "kmail/mailmerge/mailmergewidget.h"
+#include "kmail/mailmerge/widgets/mailmergewidget.h"
 
 #include <KLocalizedString>
 #include <QApplication>
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
     parser.process(app);
     aboutData.processCommandLine(&parser);
 
-    MailMergeWidget *w = new MailMergeWidget();
+    MailMerge::MailMergeWidget *w = new MailMerge::MailMergeWidget();
     w->resize(800, 600);
     w->show();
     app.exec();

mailmerge/widgets/addressbookwidget.cpp

@@ -0,0 +1,31 @@
+/*
+  Copyright (c) 2015 Montel Laurent <montel@kde.org>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License, version 2, as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "addressbookwidget.h"
+
+using namespace MailMerge;
+
+AddressBookWidget::AddressBookWidget(QWidget *parent)
+    : QWidget(parent)
+{
+
+}
+
+AddressBookWidget::~AddressBookWidget()
+{
+
+}
+

mailmerge/widgets/addressbookwidget.h

@@ -0,0 +1,32 @@
+/*
+  Copyright (c) 2015 Montel Laurent <montel@kde.org>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License, version 2, as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ADDRESSBOOKWIDGET_H
+#define ADDRESSBOOKWIDGET_H
+
+#include <QWidget>
+namespace MailMerge {
+class AddressBookWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit AddressBookWidget(QWidget *parent=0);
+    ~AddressBookWidget();
+};
+}
+
+#endif // ADDRESSBOOKWIDGET_H

mailmerge/widgets/attachmentlistwidget.cpp

@@ -27,11 +27,12 @@
 #include <KConfigGroup>
 #include <QPushButton>
 
-AttachmentListWidget::AttachmentListWidget(QWidget *parent,
-        ButtonCode buttons,
-        const QString &addLabel,
-        const QString &removeLabel,
-        const QString &modifyLabel)
+using namespace MailMerge;
+AttachmentListWidget::AttachmentListWidget(QWidget * parent,
+                                           ButtonCode buttons,
+                                           const QString & addLabel,
+                                           const QString & removeLabel,
+                                           const QString & modifyLabel)
     : PimCommon::SimpleStringListEditor(parent, buttons, addLabel, removeLabel, modifyLabel, QString())
 {
 }

mailmerge/widgets/attachmentlistwidget.h

@@ -22,6 +22,7 @@
 #include <QDialog>
 
 class KUrlRequester;
+namespace MailMerge {
 class SelectAttachmentDialog : public QDialog
 {
     Q_OBJECT
@@ -50,5 +51,5 @@ public:
     void addNewEntry() Q_DECL_OVERRIDE;
     QString modifyEntry(const QString &text) Q_DECL_OVERRIDE;
 };
-
+}
 #endif // ATTACHMENTLISTWIDGET_H

mailmerge/widgets/mailmergewidget.cpp

@@ -28,6 +28,8 @@
 #include <QLabel>
 #include <QStackedWidget>
 
+using namespace MailMerge;
+
 MailMergeWidget::MailMergeWidget(QWidget *parent)
     : QWidget(parent)
 {

mailmerge/widgets/mailmergewidget.h

@@ -22,8 +22,10 @@
 
 class KComboBox;
 class QStackedWidget;
-class AttachmentListWidget;
+
 class KUrlRequester;
+namespace MailMerge {
+class AttachmentListWidget;
 class MailMergeWidget : public QWidget
 {
     Q_OBJECT
@@ -37,7 +39,7 @@ public:
     ~MailMergeWidget();
 
 Q_SIGNALS:
-    void sourceModeChanged(MailMergeWidget::SourceType);
+    void sourceModeChanged(MailMerge::MailMergeWidget::SourceType);
 
 private Q_SLOTS:
     void slotSourceChanged(int index);
@@ -48,5 +50,5 @@ private:
     AttachmentListWidget *mAttachment;
     KUrlRequester *mCvsUrlRequester;
 };
-
+}
 #endif // MAILMERGEWIDGET_H