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

List:       kde-commits
Subject:    [kdepim] /: Fix includes
From:       Montel Laurent <montel () kde ! org>
Date:       2015-09-11 19:38:36
Message-ID: E1ZaU9c-0000tD-41 () scm ! kde ! org
[Download RAW message or body]

Git commit 38e468d42eab319dda82d996a61c0c2cbe54987a by Montel Laurent.
Committed on 11/09/2015 at 19:23.
Pushed by mlaurent into branch 'master'.

Fix includes

M  +1    -1    agents/notesagent/notesagentalarmdialog.cpp
M  +1    -1    agents/notesagent/notesagentnotedialog.cpp
M  +1    -1    agents/notesagent/notesmanager.cpp
M  +4    -4    knotes/apps/knotesapp.cpp
M  +1    -1    knotes/configdialog/knotecollectionconfigwidget.cpp
M  +1    -1    knotes/configdialog/knotedisplayconfigwidget.cpp
M  +1    -1    knotes/configdialog/knoteeditorconfigwidget.cpp
M  +1    -1    knotes/configdialog/knotesimpleconfigdialog.cpp
M  +1    -1    knotes/kontactplugin/CMakeLists.txt
M  +5    -5    knotes/kontactplugin/knotes_part.cpp
M  +1    -1    knotes/kontactplugin/knotes_plugin.cpp
M  +2    -2    knotes/kontactplugin/knotesiconview.cpp
M  +2    -2    knotes/kontactplugin/summarywidget.cpp
M  +3    -3    knotes/notes/knote.cpp
M  +1    -1    knotes/notes/knotedisplaysettings.cpp
M  +3    -3    knotes/print/knoteprintobject.cpp
M  +1    -1    knotes/utils/knoteutils.cpp
M  +14   -4    noteshared/src/CMakeLists.txt
M  +3    -3    noteshared/src/akonadi/noteschangerecorder.cpp
M  +1    -1    noteshared/src/job/createnewnotejob.cpp
M  +1    -1    noteshared/src/noteutils.cpp

http://commits.kde.org/kdepim/38e468d42eab319dda82d996a61c0c2cbe54987a

diff --git a/agents/notesagent/notesagentalarmdialog.cpp b/agents/notesagen=
t/notesagentalarmdialog.cpp
index b6e896c..40fb04b 100644
--- a/agents/notesagent/notesagentalarmdialog.cpp
+++ b/agents/notesagent/notesagentalarmdialog.cpp
@@ -18,7 +18,7 @@
 #include "notesagentalarmdialog.h"
 #include "notesagentnotedialog.h"
 #include "widget/notelistwidget.h"
-#include "attributes/notealarmattribute.h"
+#include "NoteShared/NoteAlarmAttribute"
 #include "alarms/notealarmdialog.h"
 #include "notesagent_debug.h"
 #include <KMime/KMimeMessage>
diff --git a/agents/notesagent/notesagentnotedialog.cpp b/agents/notesagent=
/notesagentnotedialog.cpp
index 9fe2ac9..15f0fc8 100644
--- a/agents/notesagent/notesagentnotedialog.cpp
+++ b/agents/notesagent/notesagentnotedialog.cpp
@@ -19,7 +19,7 @@
 #include "notesagent_debug.h"
 #include <ItemFetchJob>
 #include <ItemFetchScope>
-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/NoteDisplayAttribute"
 #include "pimcommon/texteditor/richtexteditor/richtexteditorwidget.h"
 #include "pimcommon/texteditor/richtexteditor/richtexteditor.h"
 =

diff --git a/agents/notesagent/notesmanager.cpp b/agents/notesagent/notesma=
nager.cpp
index 3e8db0a..f1f1e46 100644
--- a/agents/notesagent/notesmanager.cpp
+++ b/agents/notesagent/notesmanager.cpp
@@ -21,7 +21,7 @@
 #include "job/createnewnotejob.h"
 #include "akonadi/noteschangerecorder.h"
 #include "akonadi/notesakonaditreemodel.h"
-#include "attributes/notealarmattribute.h"
+#include "NoteShared/NoteAlarmAttribute"
 #include "notesagentalarmdialog.h"
 =

 #include <AkonadiCore/Session>
diff --git a/knotes/apps/knotesapp.cpp b/knotes/apps/knotesapp.cpp
index ccf8e16..a5db07c 100644
--- a/knotes/apps/knotesapp.cpp
+++ b/knotes/apps/knotesapp.cpp
@@ -26,10 +26,10 @@
 =

 #include "akonadi/notesakonaditreemodel.h"
 #include "akonadi/noteschangerecorder.h"
-#include "attributes/notelockattribute.h"
-#include "attributes/notedisplayattribute.h"
-#include "attributes/notealarmattribute.h"
-#include "attributes/showfoldernotesattribute.h"
+#include "NoteShared/NoteLockAttribute"
+#include "NoteShared/NoteDisplayAttribute"
+#include "NoteShared/NoteAlarmAttribute"
+#include "NoteShared/ShowFolderNotesAttribute"
 #include "resources/localresourcecreator.h"
 #include "job/createnewnotejob.h"
 =

diff --git a/knotes/configdialog/knotecollectionconfigwidget.cpp b/knotes/c=
onfigdialog/knotecollectionconfigwidget.cpp
index 9d0c715..4afa74c 100644
--- a/knotes/configdialog/knotecollectionconfigwidget.cpp
+++ b/knotes/configdialog/knotecollectionconfigwidget.cpp
@@ -18,7 +18,7 @@
 */
 =

 #include "knotecollectionconfigwidget.h"
-#include "attributes/showfoldernotesattribute.h"
+#include "NoteShared/ShowFolderNotesAttribute"
 #include <Akonadi/Notes/NoteUtils>
 #include "notesharedglobalconfig.h"
 #include "pimcommon/widgets/manageaccountwidget.h"
diff --git a/knotes/configdialog/knotedisplayconfigwidget.cpp b/knotes/conf=
igdialog/knotedisplayconfigwidget.cpp
index 191dfa8..639c397 100644
--- a/knotes/configdialog/knotedisplayconfigwidget.cpp
+++ b/knotes/configdialog/knotedisplayconfigwidget.cpp
@@ -18,7 +18,7 @@
 #include "knotedisplayconfigwidget.h"
 #include "config-kdepim.h"
 =

-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/NoteDisplayAttribute"
 =

 #include <KLocalizedString>
 #include <KColorButton>
diff --git a/knotes/configdialog/knoteeditorconfigwidget.cpp b/knotes/confi=
gdialog/knoteeditorconfigwidget.cpp
index fa11bba..b9d871f 100644
--- a/knotes/configdialog/knoteeditorconfigwidget.cpp
+++ b/knotes/configdialog/knoteeditorconfigwidget.cpp
@@ -17,7 +17,7 @@
 =

 #include "knoteeditorconfigwidget.h"
 =

-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/NoteDisplayAttribute"
 =

 #include <QSpinBox>
 #include <KLocalizedString>
diff --git a/knotes/configdialog/knotesimpleconfigdialog.cpp b/knotes/confi=
gdialog/knotesimpleconfigdialog.cpp
index e5bd29b..d629a8f 100644
--- a/knotes/configdialog/knotesimpleconfigdialog.cpp
+++ b/knotes/configdialog/knotesimpleconfigdialog.cpp
@@ -21,7 +21,7 @@
 #include "knotedisplayconfigwidget.h"
 #include "knoteeditorconfigwidget.h"
 =

-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/NoteDisplayAttribute"
 =

 #include <KLocalizedString>
 #include <KWindowSystem>
diff --git a/knotes/kontactplugin/CMakeLists.txt b/knotes/kontactplugin/CMa=
keLists.txt
index 6f1de7d..da8d532 100644
--- a/knotes/kontactplugin/CMakeLists.txt
+++ b/knotes/kontactplugin/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(kontact_knotesplugin
                       KF5::CalendarCore
                       KF5::CalendarUtils
                       KF5::KontactInterface
-                      kdepim =

+                      KF5::Libkdepim =

                       KF5::NoteShared
                       KF5::DNSSD
                       KF5::Mime
diff --git a/knotes/kontactplugin/knotes_part.cpp b/knotes/kontactplugin/kn=
otes_part.cpp
index 1b3219a..3f9700a 100644
--- a/knotes/kontactplugin/knotes_part.cpp
+++ b/knotes/kontactplugin/knotes_part.cpp
@@ -46,11 +46,11 @@
 =

 #include "akonadi/notesakonaditreemodel.h"
 #include "akonadi/noteschangerecorder.h"
-#include "attributes/notealarmattribute.h"
-#include "attributes/showfoldernotesattribute.h"
-#include "attributes/notealarmattribute.h"
-#include "attributes/notedisplayattribute.h"
-#include "attributes/notelockattribute.h"
+#include "NoteShared/NoteAlarmAttribute"
+#include "NoteShared/ShowFolderNotesAttribute"
+#include "NoteShared/NoteAlarmAttribute"
+#include "NoteShared/NoteDisplayAttribute"
+#include "NoteShared/NoteLockAttribute"
 =

 #include <Akonadi/Notes/NoteUtils>
 =

diff --git a/knotes/kontactplugin/knotes_plugin.cpp b/knotes/kontactplugin/=
knotes_plugin.cpp
index 7ce7bb6..47e8d94 100644
--- a/knotes/kontactplugin/knotes_plugin.cpp
+++ b/knotes/kontactplugin/knotes_plugin.cpp
@@ -30,7 +30,7 @@
 =

 #include "kdepim-version.h"
 =

-#include <libkdepim/misc/maillistdrag.h>
+#include <Libkdepim/MaillistDrag>
 using namespace KPIM;
 using namespace KCalUtils;
 using namespace KCalCore;
diff --git a/knotes/kontactplugin/knotesiconview.cpp b/knotes/kontactplugin=
/knotesiconview.cpp
index 51a48c5..6441047 100644
--- a/knotes/kontactplugin/knotesiconview.cpp
+++ b/knotes/kontactplugin/knotesiconview.cpp
@@ -17,8 +17,8 @@
 =

 #include "knotesiconview.h"
 #include "akonadi/notesakonaditreemodel.h"
-#include "attributes/notedisplayattribute.h"
-#include "attributes/notelockattribute.h"
+#include "NoteShared/NoteDisplayAttribute"
+#include "NoteShared/NoteLockAttribute"
 #include "noteutils.h"
 #include "knotes/notes/knotedisplaysettings.h"
 #include "utils/knoteutils.h"
diff --git a/knotes/kontactplugin/summarywidget.cpp b/knotes/kontactplugin/=
summarywidget.cpp
index 030526c..0e2d29f 100644
--- a/knotes/kontactplugin/summarywidget.cpp
+++ b/knotes/kontactplugin/summarywidget.cpp
@@ -29,8 +29,8 @@
 =

 #include "akonadi/notesakonaditreemodel.h"
 #include "akonadi/noteschangerecorder.h"
-#include "attributes/showfoldernotesattribute.h"
-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/ShowFolderNotesAttribute"
+#include "NoteShared/NoteDisplayAttribute"
 =

 #include <AkonadiCore/Item>
 #include <AkonadiCore/Session>
diff --git a/knotes/notes/knote.cpp b/knotes/notes/knote.cpp
index 268d04d..3469e1d 100644
--- a/knotes/notes/knote.cpp
+++ b/knotes/notes/knote.cpp
@@ -34,9 +34,9 @@
 =

 #include "knotedisplaysettings.h"
 =

-#include "attributes/notelockattribute.h"
-#include "attributes/notedisplayattribute.h"
-#include "attributes/notealarmattribute.h"
+#include "NoteShared/NoteLockAttribute"
+#include "NoteShared/NoteDisplayAttribute"
+#include "NoteShared/NoteAlarmAttribute"
 =

 #include "pimcommon/baloodebug/baloodebugdialog.h"
 =

diff --git a/knotes/notes/knotedisplaysettings.cpp b/knotes/notes/knotedisp=
laysettings.cpp
index 690c24f..6cef201 100644
--- a/knotes/notes/knotedisplaysettings.cpp
+++ b/knotes/notes/knotedisplaysettings.cpp
@@ -16,7 +16,7 @@
 */
 =

 #include "knotedisplaysettings.h"
-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/NoteDisplayAttribute"
 #include "knotesglobalconfig.h"
 =

 KNoteDisplaySettings::KNoteDisplaySettings(NoteShared::NoteDisplayAttribut=
e *attr)
diff --git a/knotes/print/knoteprintobject.cpp b/knotes/print/knoteprintobj=
ect.cpp
index ff5bdab..5775706 100644
--- a/knotes/print/knoteprintobject.cpp
+++ b/knotes/print/knoteprintobject.cpp
@@ -16,9 +16,9 @@
 */
 =

 #include "knoteprintobject.h"
-#include "attributes/notealarmattribute.h"
-#include "attributes/notelockattribute.h"
-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/NoteAlarmAttribute"
+#include "NoteShared/NoteLockAttribute"
+#include "NoteShared/NoteDisplayAttribute"
 =

 #include <KMime/KMimeMessage>
 =

diff --git a/knotes/utils/knoteutils.cpp b/knotes/utils/knoteutils.cpp
index 26b2c7a..7825f4f 100644
--- a/knotes/utils/knoteutils.cpp
+++ b/knotes/utils/knoteutils.cpp
@@ -16,7 +16,7 @@
 */
 =

 #include "knoteutils.h"
-#include "attributes/notedisplayattribute.h"
+#include "NoteShared/NoteDisplayAttribute"
 #include "knotesglobalconfig.h"
 =

 #include <KMessageBox>
diff --git a/noteshared/src/CMakeLists.txt b/noteshared/src/CMakeLists.txt
index d2d84d6..04dbd59 100644
--- a/noteshared/src/CMakeLists.txt
+++ b/noteshared/src/CMakeLists.txt
@@ -92,10 +92,6 @@ ecm_generate_headers(NoteShared_CamelCase_HEADERS
   editor/NoteEditorUtils
   NoteUtils
   alarms/NoteAlarmDialog
-  attributes/NoteAlarmAttribute
-  attributes/ShowFolderNotesAttribute
-  attributes/NoteLockAttribute
-  attributes/NoteDisplayAttribute
   config/NoteActionConfig
   akonadi/NotesChangeRecorder
   akonadi/NotesAkonadiTreeModel
@@ -105,9 +101,22 @@ ecm_generate_headers(NoteShared_CamelCase_HEADERS
   PREFIX NoteShared
 )
 =

+ecm_generate_headers(NoteShared_attributes_HEADERS
+  HEADER_NAMES
+  NoteAlarmAttribute
+  ShowFolderNotesAttribute
+  NoteLockAttribute
+  NoteDisplayAttribute
+  REQUIRED_HEADERS NoteShared_attributes_HEADERS
+  PREFIX NoteShared
+  RELATIVE attributes
+)
+
+
 if(${CMAKE_SOURCE_DIR} STREQUAL ${noteshared_SOURCE_DIR})
 install(FILES
     ${NoteShared_CamelCase_HEADERS}
+    ${NoteShared_attributes_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/NoteShared
     COMPONENT Devel
 )
@@ -116,6 +125,7 @@ install(FILES
     ${NoteShared_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/noteshared_export.h
     ${NoteShared_CamelCase_HEADERS}
+    ${NoteShared_attributes_HEADERS}
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/noteshared
     COMPONENT Devel
 )
diff --git a/noteshared/src/akonadi/noteschangerecorder.cpp b/noteshared/sr=
c/akonadi/noteschangerecorder.cpp
index 75c29a2..a0546fb 100644
--- a/noteshared/src/akonadi/noteschangerecorder.cpp
+++ b/noteshared/src/akonadi/noteschangerecorder.cpp
@@ -22,9 +22,9 @@
 #include <AkonadiCore/ItemFetchScope>
 #include <Akonadi/Notes/NoteUtils>
 =

-#include "noteshared/attributes/notealarmattribute.h"
-#include "noteshared/attributes/notelockattribute.h"
-#include "noteshared/attributes/notedisplayattribute.h"
+#include "attributes/notealarmattribute.h"
+#include "attributes/notelockattribute.h"
+#include "attributes/notedisplayattribute.h"
 =

 using namespace NoteShared;
 =

diff --git a/noteshared/src/job/createnewnotejob.cpp b/noteshared/src/job/c=
reatenewnotejob.cpp
index c960696..41c59fe 100644
--- a/noteshared/src/job/createnewnotejob.cpp
+++ b/noteshared/src/job/createnewnotejob.cpp
@@ -17,7 +17,7 @@
 =

 #include "createnewnotejob.h"
 #include "notesharedglobalconfig.h"
-#include "noteshared/attributes/showfoldernotesattribute.h"
+#include "attributes/showfoldernotesattribute.h"
 #include "dialog/selectednotefolderdialog.h"
 #include "noteshared_debug.h"
 #include <Akonadi/Notes/NoteUtils>
diff --git a/noteshared/src/noteutils.cpp b/noteshared/src/noteutils.cpp
index 1a70e4f..1e8dec6 100644
--- a/noteshared/src/noteutils.cpp
+++ b/noteshared/src/noteutils.cpp
@@ -18,7 +18,7 @@
 #include "noteutils.h"
 #include "network/notesnetworksender.h"
 #include "network/notehostdialog.h"
-#include "noteshared/attributes/notedisplayattribute.h"
+#include "attributes/notedisplayattribute.h"
 #include "notesharedglobalconfig.h"
 #include <KProcess>
 #include <ksocketfactory.h>

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