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

List:       kde-commits
Subject:    [kdepim/frameworks] /: Fix includes
From:       Montel Laurent <montel () kde ! org>
Date:       2014-05-05 8:00:52
Message-ID: E1WhDpU-0007Ya-NG () scm ! kde ! org
[Download RAW message or body]

Git commit 4698f06decc0a51fd339b5170bd2991775565e98 by Montel Laurent.
Committed on 05/05/2014 at 06:02.
Pushed by mlaurent into branch 'frameworks'.

Fix includes

M  +1    -1    composereditor-ng/composerview.cpp
M  +1    -1    composereditor-ng/image/composerimagedialog.cpp
M  +3    -3    composereditor-ng/private/composerview_p.cpp
M  +1    -1    grantleeeditor/grantleethemeeditor/editorwidget.cpp
M  +1    -1    grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.c=
pp
M  +1    -1    kjots/kjotsmodel.cpp
M  +1    -1    kmail/editor/kmcomposewin.cpp
M  +1    -1    libkdepim/addressline/addresseelineedit.cpp
M  +1    -1    libkdepim/addressline/completionordereditor.cpp
M  +2    -2    libkdepim/ldap/addhostdialog.cpp
M  +1    -1    libkdepim/ldap/kcmldap.cpp
M  +4    -4    libkdepim/ldap/ldapclient.cpp
M  +4    -4    libkdepim/ldap/ldapclientsearch.cpp
M  +1    -1    libkdepim/ldap/ldapclientsearch.h
M  +1    -1    libkdepim/ldap/ldapclientsearchconfig.cpp
M  +5    -5    libkdepim/ldap/ldapqueryjob.cpp
M  +2    -2    libkdepim/ldap/ldapqueryjob.h
M  +2    -2    libkdepim/ldap/ldapsearchdialog.cpp
M  +4    -4    libkdepim/ldap/ldapsession.cpp
M  +1    -1    libkdepim/ldap/ldapsession.h
M  +1    -1    libkdepim/tests/testldapclient.cpp
M  +1    -1    messagecomposer/composer/kmeditor.h
M  +1    -1    messagecomposer/job/maintextjob.cpp
M  +1    -1    messagecomposer/part/textpart.h
M  +1    -1    messagecomposer/tests/maintextjobtest.cpp
M  +1    -1    messagecore/utils/stringutil.cpp
M  +1    -1    messageviewer/viewer/mailsourceviewer.cpp
M  +1    -1    pimcommon/autocorrection/autocorrectionwidget.cpp

http://commits.kde.org/kdepim/4698f06decc0a51fd339b5170bd2991775565e98

diff --git a/composereditor-ng/composerview.cpp b/composereditor-ng/compose=
rview.cpp
index 6af9e64..7a0b6b5 100644
--- a/composereditor-ng/composerview.cpp
+++ b/composereditor-ng/composerview.cpp
@@ -24,7 +24,7 @@
 #include "table/composertableactionmenu.h"
 #include "globalsettings_base.h"
 =

-#include <KPIMTextEdit/emoticontexteditaction.h>
+#include <kpimtextedit/emoticontexteditaction.h>
 =

 =

 #include <KLocalizedString>
diff --git a/composereditor-ng/image/composerimagedialog.cpp b/composeredit=
or-ng/image/composerimagedialog.cpp
index 886c197..43e8e7f 100644
--- a/composereditor-ng/image/composerimagedialog.cpp
+++ b/composereditor-ng/image/composerimagedialog.cpp
@@ -21,7 +21,7 @@
 #include "composerimagedialog.h"
 #include "extendattributes/extendattributesbutton.h"
 =

-#include <KPIMTextEdit/insertimagewidget.h>
+#include <kpimtextedit/insertimagewidget.h>
 =

 #include <KLocalizedString>
 #include <KLineEdit>
diff --git a/composereditor-ng/private/composerview_p.cpp b/composereditor-=
ng/private/composerview_p.cpp
index 64b0ab3..bfc747f 100644
--- a/composereditor-ng/private/composerview_p.cpp
+++ b/composereditor-ng/private/composerview_p.cpp
@@ -31,9 +31,9 @@
 #include "globalsettings_base.h"
 =

 =

-#include <KPIMTextEdit/emoticontexteditaction.h>
-#include <KPIMTextEdit/inserthtmldialog.h>
-#include <KPIMTextEdit/selectspecialchardialog.h>
+#include <kpimtextedit/emoticontexteditaction.h>
+#include <kpimtextedit/inserthtmldialog.h>
+#include <kpimtextedit/selectspecialchardialog.h>
 =

 #include <Sonnet/Dialog>
 #include <sonnet/backgroundchecker.h>
diff --git a/grantleeeditor/grantleethemeeditor/editorwidget.cpp b/grantlee=
editor/grantleethemeeditor/editorwidget.cpp
index 8576f66..7e8af67 100644
--- a/grantleeeditor/grantleethemeeditor/editorwidget.cpp
+++ b/grantleeeditor/grantleethemeeditor/editorwidget.cpp
@@ -18,7 +18,7 @@
 #include "editorwidget.h"
 #include "grantleeplaintexteditor.h"
 =

-#include <KPIMTextEdit/htmlhighlighter.h>
+#include <kpimtextedit/htmlhighlighter.h>
 =

 =

 using namespace GrantleeThemeEditor;
diff --git a/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.cpp=
 b/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.cpp
index 1ac5e08..7dfdbad 100644
--- a/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.cpp
+++ b/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.cpp
@@ -16,7 +16,7 @@
 */
 =

 #include "grantleeplaintexteditor.h"
-#include <KPIMTextEdit/htmlhighlighter.h>
+#include <kpimtextedit/htmlhighlighter.h>
 =

 #include <QStringListModel>
 #include <QCompleter>
diff --git a/kjots/kjotsmodel.cpp b/kjots/kjotsmodel.cpp
index 34a7ad8..346e369 100644
--- a/kjots/kjotsmodel.cpp
+++ b/kjots/kjotsmodel.cpp
@@ -33,7 +33,7 @@
 #include <qdebug.h>
 #include <KMime/KMimeMessage>
 =

-#include <KPIMTextEdit/textutils.h>
+#include <kpimtextedit/textutils.h>
 =

 #include <grantlee/markupdirector.h>
 #include <grantlee/texthtmlbuilder.h>
diff --git a/kmail/editor/kmcomposewin.cpp b/kmail/editor/kmcomposewin.cpp
index 05634b5..7b32bb8 100644
--- a/kmail/editor/kmcomposewin.cpp
+++ b/kmail/editor/kmcomposewin.cpp
@@ -122,7 +122,7 @@
 #include <MailTransport/transport.h>
 #include <KMime/kmime_codecs.h>
 #include <KMime/kmime_message.h>
-#include <KPIMTextEdit/selectspecialchardialog.h>
+#include <kpimtextedit/selectspecialchardialog.h>
 =

 =

 // KDELIBS includes
diff --git a/libkdepim/addressline/addresseelineedit.cpp b/libkdepim/addres=
sline/addresseelineedit.cpp
index 6da619b..6e05ad7 100644
--- a/libkdepim/addressline/addresseelineedit.cpp
+++ b/libkdepim/addressline/addresseelineedit.cpp
@@ -44,7 +44,7 @@
 #include <KPIMUtils/Email>
 #include <KColorScheme>
 =

-#include <KLDAP/LdapServer>
+#include <kldap/LdapServer>
 =

 #include <KMime/Util>
 =

diff --git a/libkdepim/addressline/completionordereditor.cpp b/libkdepim/ad=
dressline/completionordereditor.cpp
index 715509f..b94b190 100644
--- a/libkdepim/addressline/completionordereditor.cpp
+++ b/libkdepim/addressline/completionordereditor.cpp
@@ -43,7 +43,7 @@
 =

 #include <KABC/addressee.h>
 #include <KABC/contactgroup.h>
-#include <KLDAP/ldapserver.h>
+#include <kldap/ldapserver.h>
 #include <KGlobal>
 =

 =

diff --git a/libkdepim/ldap/addhostdialog.cpp b/libkdepim/ldap/addhostdialo=
g.cpp
index 235299f..6c21316 100644
--- a/libkdepim/ldap/addhostdialog.cpp
+++ b/libkdepim/ldap/addhostdialog.cpp
@@ -24,8 +24,8 @@
 #include <QHBoxLayout>
 =

 #include <kacceleratormanager.h>
-#include <KLDAP/ldapserver.h>
-#include <KLDAP/ldapconfigwidget.h>
+#include <kldap/ldapserver.h>
+#include <kldap/ldapconfigwidget.h>
 #include <klocale.h>
 =

 AddHostDialog::AddHostDialog( KLDAP::LdapServer *server, QWidget *parent )
diff --git a/libkdepim/ldap/kcmldap.cpp b/libkdepim/ldap/kcmldap.cpp
index 86b3ae6..7a0f2e1 100644
--- a/libkdepim/ldap/kcmldap.cpp
+++ b/libkdepim/ldap/kcmldap.cpp
@@ -46,7 +46,7 @@
 =

 #include "ldapclientsearch.h"
 #include "ldapclientsearchconfig.h"
-#include <KLDAP/ldapserver.h>
+#include <kldap/ldapserver.h>
 =

 #include "addhostdialog_p.h"
 =

diff --git a/libkdepim/ldap/ldapclient.cpp b/libkdepim/ldap/ldapclient.cpp
index e3d7aba..a1df6fd 100644
--- a/libkdepim/ldap/ldapclient.cpp
+++ b/libkdepim/ldap/ldapclient.cpp
@@ -25,10 +25,10 @@
 #include "ldapsession.h"
 #include "ldapqueryjob.h"
 =

-#include <KLDAP/ldapobject.h>
-#include <KLDAP/ldapserver.h>
-#include <KLDAP/ldapurl.h>
-#include <KLDAP/ldif.h>
+#include <kldap/ldapobject.h>
+#include <kldap/ldapserver.h>
+#include <kldap/ldapurl.h>
+#include <kldap/ldif.h>
 =

 #include <KConfig>
 #include <KConfigGroup>
diff --git a/libkdepim/ldap/ldapclientsearch.cpp b/libkdepim/ldap/ldapclien=
tsearch.cpp
index 556ede7..70fc537 100644
--- a/libkdepim/ldap/ldapclientsearch.cpp
+++ b/libkdepim/ldap/ldapclientsearch.cpp
@@ -30,10 +30,10 @@
 #include "ldapsession.h"
 #include "ldapqueryjob.h"
 =

-#include <KLDAP/ldapobject.h>
-#include <KLDAP/ldapserver.h>
-#include <KLDAP/ldapurl.h>
-#include <KLDAP/ldif.h>
+#include <kldap/ldapobject.h>
+#include <kldap/ldapserver.h>
+#include <kldap/ldapurl.h>
+#include <kldap/ldif.h>
 =

 #include <KConfig>
 #include <KConfigGroup>
diff --git a/libkdepim/ldap/ldapclientsearch.h b/libkdepim/ldap/ldapclients=
earch.h
index 761b145..9335409 100644
--- a/libkdepim/ldap/ldapclientsearch.h
+++ b/libkdepim/ldap/ldapclientsearch.h
@@ -23,7 +23,7 @@
 #define LDAPCLIENTSEARCH_H
 =

 #include "libkdepim/kdepim_export.h"
-#include <KLDAP/ldapobject.h>
+#include <kldap/ldapobject.h>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 =

diff --git a/libkdepim/ldap/ldapclientsearchconfig.cpp b/libkdepim/ldap/lda=
pclientsearchconfig.cpp
index f281498..65096cd 100644
--- a/libkdepim/ldap/ldapclientsearchconfig.cpp
+++ b/libkdepim/ldap/ldapclientsearchconfig.cpp
@@ -18,7 +18,7 @@
  */
 =

 #include "ldapclientsearchconfig.h"
-#include <KLDAP/ldapserver.h>
+#include <kldap/ldapserver.h>
 =

 =

 #include <KStandardDirs>
diff --git a/libkdepim/ldap/ldapqueryjob.cpp b/libkdepim/ldap/ldapqueryjob.=
cpp
index 4c0bd16..30d08ff 100644
--- a/libkdepim/ldap/ldapqueryjob.cpp
+++ b/libkdepim/ldap/ldapqueryjob.cpp
@@ -20,11 +20,11 @@
 =

 #include "ldapqueryjob.h"
 =

-#include <KLDAP/ldif.h>
-#include <KLDAP/ldapcontrol.h>
-#include <KLDAP/ldapdefs.h>
-#include <KLDAP/ldapconnection.h>
-#include <KLDAP/ldapdn.h>
+#include <kldap/ldif.h>
+#include <kldap/ldapcontrol.h>
+#include <kldap/ldapdefs.h>
+#include <kldap/ldapconnection.h>
+#include <kldap/ldapdn.h>
 =

 #include <KDebug>
 =

diff --git a/libkdepim/ldap/ldapqueryjob.h b/libkdepim/ldap/ldapqueryjob.h
index f39000a..a4e321f 100644
--- a/libkdepim/ldap/ldapqueryjob.h
+++ b/libkdepim/ldap/ldapqueryjob.h
@@ -22,9 +22,9 @@
 #define KLDAP_LDAPQUERYJOB_H
 =

 #include <KJob>
-#include <KLDAP/ldapurl.h>
+#include <kldap/ldapurl.h>
 #include "ldapsession.h"
-#include <KLDAP/ldapoperation.h>
+#include <kldap/ldapoperation.h>
 =

 namespace KLDAP {
 =

diff --git a/libkdepim/ldap/ldapsearchdialog.cpp b/libkdepim/ldap/ldapsearc=
hdialog.cpp
index 27e13af..5e03cd7 100644
--- a/libkdepim/ldap/ldapsearchdialog.cpp
+++ b/libkdepim/ldap/ldapsearchdialog.cpp
@@ -48,8 +48,8 @@
 #include <kconfiggroup.h>
 #include <kcmultidialog.h>
 #include <kdialogbuttonbox.h>
-#include <KLDAP/ldapobject.h>
-#include <KLDAP/ldapserver.h>
+#include <kldap/ldapobject.h>
+#include <kldap/ldapserver.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/libkdepim/ldap/ldapsession.cpp b/libkdepim/ldap/ldapsession.cpp
index 914f6ba..8476084 100644
--- a/libkdepim/ldap/ldapsession.cpp
+++ b/libkdepim/ldap/ldapsession.cpp
@@ -20,10 +20,10 @@
 =

 #include "ldapsession.h"
 =

-#include <KLDAP/ldapoperation.h>
-#include <KLDAP/ldif.h>
-#include <KLDAP/ldapcontrol.h>
-#include <KLDAP/ldapdefs.h>
+#include <kldap/ldapoperation.h>
+#include <kldap/ldif.h>
+#include <kldap/ldapcontrol.h>
+#include <kldap/ldapdefs.h>
 =

 #include <KDebug>
 #include "ldapqueryjob.h"
diff --git a/libkdepim/ldap/ldapsession.h b/libkdepim/ldap/ldapsession.h
index 5f232fb..4c1ce4e 100644
--- a/libkdepim/ldap/ldapsession.h
+++ b/libkdepim/ldap/ldapsession.h
@@ -22,7 +22,7 @@
 #define KLDAP_LDAPSESSION_H
 =

 #include <QThread>
-#include <KLDAP/ldapconnection.h>
+#include <kldap/ldapconnection.h>
 #include <QtCore/QQueue>
 #include <QtCore/QMutex>
 =

diff --git a/libkdepim/tests/testldapclient.cpp b/libkdepim/tests/testldapc=
lient.cpp
index adbefc8..fc3a84e 100644
--- a/libkdepim/tests/testldapclient.cpp
+++ b/libkdepim/tests/testldapclient.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <qdebug.h>
 #include <kcmdlineargs.h>
-#include <KLDAP/ldapobject.h>
+#include <kldap/ldapobject.h>
 =

 #include <QEventLoop>
 =

diff --git a/messagecomposer/composer/kmeditor.h b/messagecomposer/composer=
/kmeditor.h
index 458e54a..904115d 100644
--- a/messagecomposer/composer/kmeditor.h
+++ b/messagecomposer/composer/kmeditor.h
@@ -25,7 +25,7 @@
 =

 #include "messagecomposer_export.h"
 =

-#include <KPIMTextEdit/TextEdit>
+#include <kpimtextedit/TextEdit>
 #include <KUrl>
 =

 namespace KPIMIdentities {
diff --git a/messagecomposer/job/maintextjob.cpp b/messagecomposer/job/main=
textjob.cpp
index 6a80aaf..b9f460e 100644
--- a/messagecomposer/job/maintextjob.cpp
+++ b/messagecomposer/job/maintextjob.cpp
@@ -36,7 +36,7 @@
 =

 #include <KMime/kmime_content.h>
 =

-#include <KPIMTextEdit/textedit.h>
+#include <kpimtextedit/textedit.h>
 =

 using namespace MessageComposer;
 =

diff --git a/messagecomposer/part/textpart.h b/messagecomposer/part/textpar=
t.h
index 89c7686..e5eae23 100644
--- a/messagecomposer/part/textpart.h
+++ b/messagecomposer/part/textpart.h
@@ -25,7 +25,7 @@
 #include "messagecomposer_export.h"
 #include "messagepart.h"
 =

-#include <KPIMTextEdit/textedit.h>
+#include <kpimtextedit/textedit.h>
 =

 namespace MessageComposer {
 =

diff --git a/messagecomposer/tests/maintextjobtest.cpp b/messagecomposer/te=
sts/maintextjobtest.cpp
index c46c597..d2c1971 100644
--- a/messagecomposer/tests/maintextjobtest.cpp
+++ b/messagecomposer/tests/maintextjobtest.cpp
@@ -34,7 +34,7 @@ using namespace KMime;
 #include <messagecomposer/part/textpart.h>
 using namespace MessageComposer;
 =

-#include <KPIMTextEdit/textedit.h>
+#include <kpimtextedit/textedit.h>
 =

 QTEST_KDEMAIN( MainTextJobTest, GUI )
 =

diff --git a/messagecore/utils/stringutil.cpp b/messagecore/utils/stringuti=
l.cpp
index 605918a..0939269 100644
--- a/messagecore/utils/stringutil.cpp
+++ b/messagecore/utils/stringutil.cpp
@@ -38,7 +38,7 @@
 #include <QHostInfo>
 #include <QRegExp>
 #include <QStringList>
-#include <KPIMTextEdit/textutils.h>
+#include <kpimtextedit/textutils.h>
 =

 using namespace KMime;
 using namespace KMime::Types;
diff --git a/messageviewer/viewer/mailsourceviewer.cpp b/messageviewer/view=
er/mailsourceviewer.cpp
index f047896..ca1ce79 100644
--- a/messageviewer/viewer/mailsourceviewer.cpp
+++ b/messageviewer/viewer/mailsourceviewer.cpp
@@ -34,7 +34,7 @@
 #include "mailsourceviewer.h"
 #include "utils/util.h"
 #include "findbar/findbarsourceview.h"
-#include <KPIMTextEdit/htmlhighlighter.h>
+#include <kpimtextedit/htmlhighlighter.h>
 #include "pimcommon/util/pimutil.h"
 #include <kiconloader.h>
 #include <KLocalizedString>
diff --git a/pimcommon/autocorrection/autocorrectionwidget.cpp b/pimcommon/=
autocorrection/autocorrectionwidget.cpp
index a8d4a87..b0d7189 100644
--- a/pimcommon/autocorrection/autocorrectionwidget.cpp
+++ b/pimcommon/autocorrection/autocorrectionwidget.cpp
@@ -25,7 +25,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 #include "import/importabstractautocorrection.h"
 =

 #include "settings/pimcommonsettings.h"
-#include <KPIMTextEdit/selectspecialchardialog.h>
+#include <kpimtextedit/selectspecialchardialog.h>
 =

 #include <KFileDialog>
 #include <KMessageBox>

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