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

List:       kde-commits
Subject:    [kdepim] messageviewer: Move to createevent plugin
From:       Montel Laurent <montel () kde ! org>
Date:       2015-10-01 6:57:50
Message-ID: E1ZhXoM-00009A-2n () scm ! kde ! org
[Download RAW message or body]

Git commit 76b355e9592837f342d2897b6ec6913642a3c93c by Montel Laurent.
Committed on 01/10/2015 at 06:57.
Pushed by mlaurent into branch 'master'.

Move to createevent plugin

M  +0    -1    messageviewer/autotests/CMakeLists.txt
M  +0    -1    messageviewer/src/CMakeLists.txt
M  +3    -2    messageviewer/src/viewerplugins/autotests/CMakeLists.txt
R  +1    -1    messageviewer/src/viewerplugins/autotests/eventdatetimewidge=
ttest.cpp [from: messageviewer/autotests/eventdatetimewidgettest.cpp - 098%=
 similarity]
R  +0    -0    messageviewer/src/viewerplugins/autotests/eventdatetimewidge=
ttest.h [from: messageviewer/autotests/eventdatetimewidgettest.h - 100% sim=
ilarity]
M  +1    -1    messageviewer/src/viewerplugins/autotests/eventedittest.cpp
M  +1    -0    messageviewer/src/viewerplugins/createeventplugin/CMakeLists=
.txt
R  +0    -0    messageviewer/src/viewerplugins/createeventplugin/eventdatet=
imewidget.cpp [from: messageviewer/src/widgets/eventdatetimewidget.cpp - 10=
0% similarity]
R  +1    -2    messageviewer/src/viewerplugins/createeventplugin/eventdatet=
imewidget.h [from: messageviewer/src/widgets/eventdatetimewidget.h - 093% s=
imilarity]
M  +1    -1    messageviewer/src/viewerplugins/createeventplugin/eventedit.=
cpp

http://commits.kde.org/kdepim/76b355e9592837f342d2897b6ec6913642a3c93c

diff --git a/messageviewer/autotests/CMakeLists.txt b/messageviewer/autotes=
ts/CMakeLists.txt
index e1af35c..0eeb8dc 100644
--- a/messageviewer/autotests/CMakeLists.txt
+++ b/messageviewer/autotests/CMakeLists.txt
@@ -42,7 +42,6 @@ add_messageviewer_crypto_unittest( unencryptedmessagetest=
.cpp )
 add_messageviewer_crypto_unittest( attachmenttest.cpp )
 add_messageviewer_unittest( cryptohelpertest.cpp )
 add_messageviewer_unittest( noteedittest.cpp )
-add_messageviewer_unittest( eventdatetimewidgettest.cpp )
 add_messageviewer_unittest( messagedisplayformatattributetest.cpp )
 add_messageviewer_unittest( nodehelpertest.cpp )
 =

diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeList=
s.txt
index cd12061..d7ad909 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -117,7 +117,6 @@ set(libmessageviewer_widgets_SRCS
   widgets/invitationsettings.cpp
   widgets/noteedit.cpp
   widgets/openattachmentfolderwidget.cpp
-  widgets/eventdatetimewidget.cpp
   widgets/mailsourceviewer.cpp
   widgets/mailsourceviewtextbrowserwidget.cpp
 )
diff --git a/messageviewer/src/viewerplugins/autotests/CMakeLists.txt b/mes=
sageviewer/src/viewerplugins/autotests/CMakeLists.txt
index 7ce95ef..8d2e0d2 100644
--- a/messageviewer/src/viewerplugins/autotests/CMakeLists.txt
+++ b/messageviewer/src/viewerplugins/autotests/CMakeLists.txt
@@ -35,8 +35,9 @@ endmacro ()
 add_messageviewer_viewerplugin_class_unittest(viewerpluginmanagertest.cpp)
 add_messageviewer_viewerplugin_class_unittest(viewerplugintoolmanagertest.=
cpp)
 add_messageviewer_viewerplugin_widget_unittest(todoedittest.cpp "../create=
todoplugin/todoedit.cpp")
-add_messageviewer_viewerplugin_widget_unittest(eventedittest.cpp "../creat=
eeventplugin/eventedit.cpp")
-add_messageviewer_viewerplugin_unittest(viewerplugincreateeventtest.cpp ".=
./createeventplugin/eventedit.cpp;../createeventplugin/viewerplugincreateev=
ent.cpp;../createeventplugin/viewerplugincreateeventinterface.cpp" "../crea=
teeventplugin/messageviewer_createeventplugin.desktop")
+add_messageviewer_viewerplugin_widget_unittest(eventedittest.cpp "../creat=
eeventplugin/eventedit.cpp;../createeventplugin/eventdatetimewidget.cpp")
+add_messageviewer_viewerplugin_widget_unittest(eventdatetimewidgettest.cpp=
 "../createeventplugin/eventdatetimewidget.cpp")
+add_messageviewer_viewerplugin_unittest(viewerplugincreateeventtest.cpp ".=
./createeventplugin/eventdatetimewidget.cpp;../createeventplugin/eventedit.=
cpp;../createeventplugin/viewerplugincreateevent.cpp;../createeventplugin/v=
iewerplugincreateeventinterface.cpp" "../createeventplugin/messageviewer_cr=
eateeventplugin.desktop")
 add_messageviewer_viewerplugin_unittest(viewerplugincreatetodotest.cpp "..=
/createtodoplugin/viewerplugincreatetodo.cpp;../createtodoplugin/viewerplug=
increatetodointerface.cpp;../createtodoplugin/todoedit.cpp" "../createtodop=
lugin/messageviewer_createtodoplugin.desktop")
 add_messageviewer_viewerplugin_unittest(viewerplugincreatenotetest.cpp "..=
/createnoteplugin/viewerplugincreatenote.cpp;../createnoteplugin/viewerplug=
increatenoteinterface.cpp" "../createnoteplugin/messageviewer_createnoteplu=
gin.desktop")
 add_messageviewer_viewerplugin_unittest(viewerplugintranslatortest.cpp "..=
/translatorplugin/viewerplugintranslator.cpp;../translatorplugin/viewerplug=
intranslatorinterface.cpp" "../translatorplugin/messageviewer_translatorplu=
gin.desktop")
diff --git a/messageviewer/autotests/eventdatetimewidgettest.cpp b/messagev=
iewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp
similarity index 98%
rename from messageviewer/autotests/eventdatetimewidgettest.cpp
rename to messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest=
.cpp
index 51724bf..e183867 100644
--- a/messageviewer/autotests/eventdatetimewidgettest.cpp
+++ b/messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest.cpp
@@ -16,7 +16,7 @@
 */
 =

 #include "eventdatetimewidgettest.h"
-#include "widgets/eventdatetimewidget.h"
+#include "../createeventplugin/eventdatetimewidget.h"
 #include <KDateComboBox>
 #include <KTimeComboBox>
 #include <qtest.h>
diff --git a/messageviewer/autotests/eventdatetimewidgettest.h b/messagevie=
wer/src/viewerplugins/autotests/eventdatetimewidgettest.h
similarity index 100%
rename from messageviewer/autotests/eventdatetimewidgettest.h
rename to messageviewer/src/viewerplugins/autotests/eventdatetimewidgettest=
.h
diff --git a/messageviewer/src/viewerplugins/autotests/eventedittest.cpp b/=
messageviewer/src/viewerplugins/autotests/eventedittest.cpp
index d0ef65d..c896f88 100644
--- a/messageviewer/src/viewerplugins/autotests/eventedittest.cpp
+++ b/messageviewer/src/viewerplugins/autotests/eventedittest.cpp
@@ -17,7 +17,7 @@
 =

 #include "eventedittest.h"
 #include "../createeventplugin/eventedit.h"
-#include "widgets/eventdatetimewidget.h"
+#include "../createeventplugin/eventdatetimewidget.h"
 #include "globalsettings_messageviewer.h"
 =

 #include <AkonadiCore/Collection>
diff --git a/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.t=
xt b/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt
index be78132..75aa6aa 100644
--- a/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt
+++ b/messageviewer/src/viewerplugins/createeventplugin/CMakeLists.txt
@@ -2,6 +2,7 @@ set(messageviewer_createeventplugin_SRCS
     viewerplugincreateevent.cpp
     viewerplugincreateeventinterface.cpp
     eventedit.cpp
+    eventdatetimewidget.cpp
 )
 =

 add_library(messageviewer_createeventplugin MODULE ${messageviewer_createe=
ventplugin_SRCS})
diff --git a/messageviewer/src/widgets/eventdatetimewidget.cpp b/messagevie=
wer/src/viewerplugins/createeventplugin/eventdatetimewidget.cpp
similarity index 100%
rename from messageviewer/src/widgets/eventdatetimewidget.cpp
rename to messageviewer/src/viewerplugins/createeventplugin/eventdatetimewi=
dget.cpp
diff --git a/messageviewer/src/widgets/eventdatetimewidget.h b/messageviewe=
r/src/viewerplugins/createeventplugin/eventdatetimewidget.h
similarity index 93%
rename from messageviewer/src/widgets/eventdatetimewidget.h
rename to messageviewer/src/viewerplugins/createeventplugin/eventdatetimewi=
dget.h
index 39100bf..a15f548 100644
--- a/messageviewer/src/widgets/eventdatetimewidget.h
+++ b/messageviewer/src/viewerplugins/createeventplugin/eventdatetimewidget=
.h
@@ -20,12 +20,11 @@
 =

 #include <QWidget>
 #include <QDateTime>
-#include "messageviewer_export.h"
 =

 namespace MessageViewer
 {
 class EventDateTimeWidgetPrivate;
-class MESSAGEVIEWER_EXPORT EventDateTimeWidget : public QWidget
+class EventDateTimeWidget : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/messageviewer/src/viewerplugins/createeventplugin/eventedit.cp=
p b/messageviewer/src/viewerplugins/createeventplugin/eventedit.cpp
index 4e37e12..604c3d0 100644
--- a/messageviewer/src/viewerplugins/createeventplugin/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 "widgets/eventdatetimewidget.h"
+#include "eventdatetimewidget.h"
 =

 #include <KLocalizedString>
 #include <QLineEdit>
[prev in list] [next in list] [prev in thread] [next in thread]