[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 6:11:36
Message-ID: E1ZhX5c-0001mh-VY () scm ! kde ! org
[Download RAW message or body]

Git commit 87d1af74485bb8bf69bccbf216aed987d0b82b86 by Montel Laurent.
Committed on 01/10/2015 at 06:11.
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  +2    -1    messageviewer/src/viewerplugins/autotests/CMakeLists.txt
R  +1    -1    messageviewer/src/viewerplugins/autotests/eventedittest.cpp [from: \
messageviewer/autotests/eventedittest.cpp - 099% similarity] R  +0    -0    \
messageviewer/src/viewerplugins/autotests/eventedittest.h [from: \
messageviewer/autotests/eventedittest.h - 100% similarity] M  +2    -1    \
messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt R  +5    -5    \
messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp [from: \
messageviewer/src/widgets/eventedit.cpp - 097% similarity] R  +1    -2    \
messageviewer/src/viewerplugins/createeventplugin/eventedit.h [from: \
messageviewer/src/widgets/eventedit.h - 096% similarity] M  +1    -1    \
messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp


http://commits.kde.org/kdepim/87d1af74485bb8bf69bccbf216aed987d0b82b86

diff --git a/messageviewer/autotests/CMakeLists.txt \
b/messageviewer/autotests/CMakeLists.txt index 06e2f34..e1af35c 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( eventedittest.cpp )
 add_messageviewer_unittest( noteedittest.cpp )
 add_messageviewer_unittest( eventdatetimewidgettest.cpp )
 add_messageviewer_unittest( messagedisplayformatattributetest.cpp )
diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeLists.txt
index d0bb179..cd12061 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/eventedit.cpp
   widgets/noteedit.cpp
   widgets/openattachmentfolderwidget.cpp
   widgets/eventdatetimewidget.cpp
diff --git a/messageviewer/src/viewerplugins/autotests/CMakeLists.txt \
b/messageviewer/src/viewerplugins/autotests/CMakeLists.txt index 3b6e8f2..7ce95ef \
                100644
--- a/messageviewer/src/viewerplugins/autotests/CMakeLists.txt
+++ b/messageviewer/src/viewerplugins/autotests/CMakeLists.txt
@@ -35,7 +35,8 @@ 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_widget_unittest(eventedittest.cpp \
"../createeventplugin/eventedit.cpp") \
+add_messageviewer_viewerplugin_unittest(viewerplugincreateeventtest.cpp \
"../createeventplugin/eventedit.cpp;../createeventplugin/viewerplugincreateevent.cpp;../createeventplugin/viewerplugincreateeventinterface.cpp" \
"../createeventplugin/messageviewer_createeventplugin.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/eventedittest.cpp \
b/messageviewer/src/viewerplugins/autotests/eventedittest.cpp similarity index 99%
rename from messageviewer/autotests/eventedittest.cpp
rename to messageviewer/src/viewerplugins/autotests/eventedittest.cpp
index 4bfee1a..d0ef65d 100644
--- a/messageviewer/autotests/eventedittest.cpp
+++ b/messageviewer/src/viewerplugins/autotests/eventedittest.cpp
@@ -16,7 +16,7 @@
 */
 
 #include "eventedittest.h"
-#include "widgets/eventedit.h"
+#include "../createeventplugin/eventedit.h"
 #include "widgets/eventdatetimewidget.h"
 #include "globalsettings_messageviewer.h"
 
diff --git a/messageviewer/autotests/eventedittest.h \
b/messageviewer/src/viewerplugins/autotests/eventedittest.h similarity index 100%
rename from messageviewer/autotests/eventedittest.h
rename to messageviewer/src/viewerplugins/autotests/eventedittest.h
diff --git a/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt \
b/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt index \
                2fb1e31..be78132 100644
--- a/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt
+++ b/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt
@@ -1,12 +1,13 @@
 set(messageviewer_createeventplugin_SRCS
     viewerplugincreateevent.cpp
     viewerplugincreateeventinterface.cpp
+    eventedit.cpp
 )
 
 add_library(messageviewer_createeventplugin MODULE \
${messageviewer_createeventplugin_SRCS})  
 target_link_libraries(messageviewer_createeventplugin
-  KF5::MessageViewer KF5::XmlGui KF5::CalendarCore
+  KF5::MessageViewer KF5::XmlGui KF5::CalendarCore KF5::IncidenceEditorsng
 )
 
 install(TARGETS messageviewer_createeventplugin DESTINATION \
                ${PLUGIN_INSTALL_DIR}/messageviewer)
diff --git a/messageviewer/src/widgets/eventedit.cpp \
b/messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp similarity index \
97% rename from messageviewer/src/widgets/eventedit.cpp
rename to messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp
index 64ff4ef..4e37e12 100644
--- a/messageviewer/src/widgets/eventedit.cpp
+++ b/messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp
@@ -18,7 +18,7 @@
 #include "eventedit.h"
 #include "messageviewer_debug.h"
 #include "globalsettings_messageviewer.h"
-#include "eventdatetimewidget.h"
+#include "widgets/eventdatetimewidget.h"
 
 #include <KLocalizedString>
 #include <QLineEdit>
@@ -42,7 +42,7 @@
 
 namespace MessageViewer
 {
-MESSAGEVIEWER_EXPORT QAbstractItemModel *_k_eventEditStubModel = 0;
+QAbstractItemModel *_k_eventEditStubModel = 0;
 }
 
 using namespace MessageViewer;
@@ -253,19 +253,19 @@ void EventEdit::slotCloseWidget()
 void EventEdit::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;
     }
 
     const QDateTime dtstart = mStartDateTimeEdit->dateTime();
     const QDateTime dtend = mEndDateTimeEdit->dateTime();
     if (!dtstart.isValid() || !dtend.isValid()) {
-        qCDebug(MESSAGEVIEWER_LOG) << " date is not valid !";
+        //qCDebug(MESSAGEVIEWER_LOG) << " date is not valid !";
         return;
     }
 
diff --git a/messageviewer/src/widgets/eventedit.h \
b/messageviewer/src/viewerplugins/createeventplugin/eventedit.h similarity index 96%
rename from messageviewer/src/widgets/eventedit.h
rename to messageviewer/src/viewerplugins/createeventplugin/eventedit.h
index adcd77e..f0efb57 100644
--- a/messageviewer/src/widgets/eventedit.h
+++ b/messageviewer/src/viewerplugins/createeventplugin/eventedit.h
@@ -19,7 +19,6 @@
 #define EVENTEDIT_H
 
 #include <QWidget>
-#include "messageviewer_export.h"
 
 #include <AkonadiCore/Collection>
 #include <KMime/Message>
@@ -35,7 +34,7 @@ class CollectionComboBox;
 namespace MessageViewer
 {
 class EventDateTimeWidget;
-class MESSAGEVIEWER_EXPORT EventEdit : public QWidget
+class EventEdit : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp \
b/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
 index 4767ccc..ae81d07 100644
--- a/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
                
+++ b/messageviewer/src/viewerplugins/createeventplugin/viewerplugincreateeventinterface.cpp
 @@ -16,7 +16,7 @@
 */
 
 #include "viewerplugincreateeventinterface.h"
-#include "widgets/eventedit.h"
+#include "eventedit.h"
 #include <KLocalizedString>
 
 #include <KActionCollection>


[prev in list] [next in list] [prev in thread] [next in thread]