[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] messageviewer: Move in plugin directly
From: Montel Laurent <montel () kde ! org>
Date: 2015-10-01 5:57:08
Message-ID: E1ZhWrc-00014x-CB () scm ! kde ! org
[Download RAW message or body]
Git commit 58806083c355a12a8e7fed88b4c3b5ee349aa805 by Montel Laurent.
Committed on 01/10/2015 at 05:56.
Pushed by mlaurent into branch 'master'.
Move in plugin directly
M +0 -1 messageviewer/autotests/CMakeLists.txt
M +0 -1 messageviewer/src/CMakeLists.txt
M +14 -2 messageviewer/src/viewerplugins/autotests/CMakeLists.txt
R +1 -1 messageviewer/src/viewerplugins/autotests/todoedittest.cpp [from: \
messageviewer/autotests/todoedittest.cpp - 099% similarity] R +0 -0 \
messageviewer/src/viewerplugins/autotests/todoedittest.h [from: \
messageviewer/autotests/todoedittest.h - 100% similarity] M +2 -1 \
messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt R +3 -3 \
messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp [from: \
messageviewer/src/widgets/todoedit.cpp - 098% similarity] R +1 -2 \
messageviewer/src/viewerplugins/createtodoplugin/todoedit.h [from: \
messageviewer/src/widgets/todoedit.h - 096% similarity] M +1 -1 \
messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
http://commits.kde.org/kdepim/58806083c355a12a8e7fed88b4c3b5ee349aa805
diff --git a/messageviewer/autotests/CMakeLists.txt \
b/messageviewer/autotests/CMakeLists.txt index 953261a..06e2f34 100644
--- a/messageviewer/autotests/CMakeLists.txt
+++ b/messageviewer/autotests/CMakeLists.txt
@@ -41,7 +41,6 @@ add_messageviewer_crypto_unittest( rendertest.cpp )
add_messageviewer_crypto_unittest( unencryptedmessagetest.cpp )
add_messageviewer_crypto_unittest( attachmenttest.cpp )
add_messageviewer_unittest( cryptohelpertest.cpp )
-add_messageviewer_unittest( todoedittest.cpp )
add_messageviewer_unittest( eventedittest.cpp )
add_messageviewer_unittest( noteedittest.cpp )
add_messageviewer_unittest( eventdatetimewidgettest.cpp )
diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeLists.txt
index 1958a3e..d0bb179 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -115,7 +115,6 @@ set(libmessageviewer_widgets_SRCS
widgets/htmlstatusbar.cpp
widgets/vcardviewer.cpp
widgets/invitationsettings.cpp
- widgets/todoedit.cpp
widgets/eventedit.cpp
widgets/noteedit.cpp
widgets/openattachmentfolderwidget.cpp
diff --git a/messageviewer/src/viewerplugins/autotests/CMakeLists.txt \
b/messageviewer/src/viewerplugins/autotests/CMakeLists.txt index b2ed280..3b6e8f2 \
100644
--- a/messageviewer/src/viewerplugins/autotests/CMakeLists.txt
+++ b/messageviewer/src/viewerplugins/autotests/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(add_messageviewer_viewerplugin_unittest _source _additional \
_jsonfile) add_test( ${_name} ${_name} )
ecm_mark_as_test(messageviewer-viewerplugin-unittest-${_name})
- target_link_libraries( ${_name} KF5::MessageViewer KF5::Libkleo KF5::QGpgme \
Qt5::Test Qt5::WebKitWidgets KF5::KIOCore KF5::Mime KF5::AkonadiCore \
KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme) + target_link_libraries( \
${_name} KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test Qt5::WebKitWidgets \
KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore \
KF5::GrantleeTheme KF5::IncidenceEditorsng) endmacro ()
@@ -21,9 +21,21 @@ macro(add_messageviewer_viewerplugin_class_unittest _source )
target_link_libraries( ${_name} KF5::MessageViewer KF5::Libkleo KF5::QGpgme \
Qt5::Test Qt5::WebKitWidgets KF5::KIOCore KF5::Mime KF5::AkonadiCore \
KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme) endmacro ()
+macro(add_messageviewer_viewerplugin_widget_unittest _source _additional )
+ set( _test ${_source} ${_additional})
+ get_filename_component(_name ${_source} NAME_WE)
+ add_executable( ${_name} ${_test} )
+ add_test( ${_name} ${_name} )
+
+ ecm_mark_as_test(messageviewer-viewerplugin-${_name})
+ target_link_libraries( ${_name} KF5::MessageViewer KF5::Libkleo KF5::QGpgme \
Qt5::Test Qt5::WebKitWidgets KF5::KIOCore KF5::Mime KF5::AkonadiCore \
KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme KF5::IncidenceEditorsng) \
+endmacro () +
+
add_messageviewer_viewerplugin_class_unittest(viewerpluginmanagertest.cpp)
add_messageviewer_viewerplugin_class_unittest(viewerplugintoolmanagertest.cpp)
+add_messageviewer_viewerplugin_widget_unittest(todoedittest.cpp \
"../createtodoplugin/todoedit.cpp") \
add_messageviewer_viewerplugin_unittest(viewerplugincreateeventtest.cpp \
"../createeventplugin/viewerplugincreateevent.cpp;../createeventplugin/viewerplugincreateeventinterface.cpp" \
"../createeventplugin/messageviewer_createeventplugin.desktop")
-add_messageviewer_viewerplugin_unittest(viewerplugincreatetodotest.cpp \
"../createtodoplugin/viewerplugincreatetodo.cpp;../createtodoplugin/viewerplugincreatetodointerface.cpp" \
"../createtodoplugin/messageviewer_createtodoplugin.desktop") \
+add_messageviewer_viewerplugin_unittest(viewerplugincreatetodotest.cpp \
"../createtodoplugin/viewerplugincreatetodo.cpp;../createtodoplugin/viewerplugincreatetodointerface.cpp;../createtodoplugin/todoedit.cpp" \
"../createtodoplugin/messageviewer_createtodoplugin.desktop") \
add_messageviewer_viewerplugin_unittest(viewerplugincreatenotetest.cpp \
"../createnoteplugin/viewerplugincreatenote.cpp;../createnoteplugin/viewerplugincreatenoteinterface.cpp" \
"../createnoteplugin/messageviewer_createnoteplugin.desktop") \
add_messageviewer_viewerplugin_unittest(viewerplugintranslatortest.cpp \
"../translatorplugin/viewerplugintranslator.cpp;../translatorplugin/viewerplugintranslatorinterface.cpp" \
"../translatorplugin/messageviewer_translatorplugin.desktop")
diff --git a/messageviewer/autotests/todoedittest.cpp \
b/messageviewer/src/viewerplugins/autotests/todoedittest.cpp similarity index 99%
rename from messageviewer/autotests/todoedittest.cpp
rename to messageviewer/src/viewerplugins/autotests/todoedittest.cpp
index 426d551..f964902 100644
--- a/messageviewer/autotests/todoedittest.cpp
+++ b/messageviewer/src/viewerplugins/autotests/todoedittest.cpp
@@ -17,7 +17,7 @@
#include "todoedittest.h"
#include "globalsettings_messageviewer.h"
-#include "widgets/todoedit.h"
+#include "../createtodoplugin/todoedit.h"
#include <AkonadiCore/Collection>
#include <AkonadiWidgets/CollectionComboBox>
#include <AkonadiCore/EntityTreeModel>
diff --git a/messageviewer/autotests/todoedittest.h \
b/messageviewer/src/viewerplugins/autotests/todoedittest.h similarity index 100%
rename from messageviewer/autotests/todoedittest.h
rename to messageviewer/src/viewerplugins/autotests/todoedittest.h
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt \
b/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt index \
687a753..60f7058 100644
--- a/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt
+++ b/messageviewer/src/viewerplugins/createtodoplugin/CMakeLists.txt
@@ -1,12 +1,13 @@
set(messageviewer_createtodoplugin_SRCS
viewerplugincreatetodo.cpp
viewerplugincreatetodointerface.cpp
+ todoedit.cpp
)
add_library(messageviewer_createtodoplugin MODULE \
${messageviewer_createtodoplugin_SRCS})
target_link_libraries(messageviewer_createtodoplugin
- KF5::MessageViewer KF5::XmlGui KF5::CalendarCore
+ KF5::MessageViewer KF5::XmlGui KF5::CalendarCore KF5::IncidenceEditorsng
)
install(TARGETS messageviewer_createtodoplugin DESTINATION \
${PLUGIN_INSTALL_DIR}/messageviewer)
diff --git a/messageviewer/src/widgets/todoedit.cpp \
b/messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp similarity index 98%
rename from messageviewer/src/widgets/todoedit.cpp
rename to messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp
index f13866a..01b0195 100644
--- a/messageviewer/src/widgets/todoedit.cpp
+++ b/messageviewer/src/viewerplugins/createtodoplugin/todoedit.cpp
@@ -38,7 +38,7 @@
namespace MessageViewer
{
-MESSAGEVIEWER_EXPORT QAbstractItemModel *_k_todoEditStubModel = 0;
+QAbstractItemModel *_k_todoEditStubModel = 0;
}
using namespace MessageViewer;
@@ -219,12 +219,12 @@ void TodoEdit::slotCloseWidget()
void TodoEdit::slotReturnPressed()
{
if (!mMessage) {
- qCDebug(MESSAGEVIEWER_LOG) << " Message is null";
+ //qCDebug(MESSAGEVIEWER_LOG) << " Message is null";
return;
}
const Akonadi::Collection collection = mCollectionCombobox->currentCollection();
if (!collection.isValid()) {
- qCDebug(MESSAGEVIEWER_LOG) << " Collection is not valid";
+ //qCDebug(MESSAGEVIEWER_LOG) << " Collection is not valid";
return;
}
diff --git a/messageviewer/src/widgets/todoedit.h \
b/messageviewer/src/viewerplugins/createtodoplugin/todoedit.h similarity index 96%
rename from messageviewer/src/widgets/todoedit.h
rename to messageviewer/src/viewerplugins/createtodoplugin/todoedit.h
index d43127a..c288fa7 100644
--- a/messageviewer/src/widgets/todoedit.h
+++ b/messageviewer/src/viewerplugins/createtodoplugin/todoedit.h
@@ -22,7 +22,6 @@
#include <AkonadiCore/Collection>
#include <KMime/Message>
#include <KCalCore/Todo>
-#include "messageviewer_export.h"
class KMessageWidget;
class QLineEdit;
@@ -34,7 +33,7 @@ class CollectionComboBox;
namespace MessageViewer
{
-class MESSAGEVIEWER_EXPORT TodoEdit : public QWidget
+class TodoEdit : public QWidget
{
Q_OBJECT
public:
diff --git a/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp \
b/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
index c565325..dccf781 100644
--- a/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
+++ b/messageviewer/src/viewerplugins/createtodoplugin/viewerplugincreatetodointerface.cpp
@@ -16,7 +16,7 @@
*/
#include "viewerplugincreatetodointerface.h"
-#include "widgets/todoedit.h"
+#include "todoedit.h"
#include <KLocalizedString>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic