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

List:       kde-commits
Subject:    [kopete] plugins/cryptography: Fix includes for cryptography plugin
From:       Pali_Rohár <pali.rohar () gmail ! com>
Date:       2013-10-24 18:09:05
Message-ID: E1VZPLF-0008D6-6n () scm ! kde ! org
[Download RAW message or body]

Git commit c14fd0225344fe8d806ad6386751fff1acebeeba by Pali Rohár.
Committed on 23/10/2013 at 14:46.
Pushed by pali into branch 'master'.

Fix includes for cryptography plugin

M  +1    -1    plugins/cryptography/CMakeLists.txt
M  +9    -9    plugins/cryptography/cryptographyguiclient.cpp
M  +1    -1    plugins/cryptography/cryptographymessagehandler.cpp
M  +1    -1    plugins/cryptography/cryptographymessagehandler.h
M  +9    -9    plugins/cryptography/cryptographyplugin.cpp
M  +1    -1    plugins/cryptography/cryptographyplugin.h
M  +3    -3    plugins/cryptography/cryptographyselectuserkey.cpp
M  +2    -2    plugins/cryptography/exportkeys.cpp

http://commits.kde.org/kopete/c14fd0225344fe8d806ad6386751fff1acebeeba

diff --git a/plugins/cryptography/CMakeLists.txt \
b/plugins/cryptography/CMakeLists.txt index d59946b..f1faffa 100644
--- a/plugins/cryptography/CMakeLists.txt
+++ b/plugins/cryptography/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories (${KLEOPATRA_INCLUDE_DIR})
+include_directories (${KLEOPATRA_INCLUDE_DIR} ${KOPETE_INCLUDES})
 
 ########### next target ###############
 
diff --git a/plugins/cryptography/cryptographyguiclient.cpp \
b/plugins/cryptography/cryptographyguiclient.cpp index 95a73b7..7a55480 100644
--- a/plugins/cryptography/cryptographyguiclient.cpp
+++ b/plugins/cryptography/cryptographyguiclient.cpp
@@ -19,15 +19,15 @@
 #include "cryptographyplugin.h"
 #include "cryptographysettings.h"
 
-#include <kopete/kopetemetacontact.h>
-#include <kopete/kopetecontact.h>
-#include <kopete/kopetecontactlist.h>
-#include <kopete/kopetechatsession.h>
-#include <kopete/ui/kopeteview.h>
-#include <kopete/kopeteuiglobal.h>
-#include <kopete/kopeteprotocol.h>
-
-#include <kopete/kabcpersistence.h>
+#include "kopetemetacontact.h"
+#include "kopetecontact.h"
+#include "kopetecontactlist.h"
+#include "kopetechatsession.h"
+#include "ui/kopeteview.h"
+#include "kopeteuiglobal.h"
+#include "kopeteprotocol.h"
+#include "kabcpersistence.h"
+
 #include <kabc/addressee.h>
 #include <kabc/addressbook.h>
 #include "exportkeys.h"
diff --git a/plugins/cryptography/cryptographymessagehandler.cpp \
b/plugins/cryptography/cryptographymessagehandler.cpp index ab7cd62..cbff0b0 100644
--- a/plugins/cryptography/cryptographymessagehandler.cpp
+++ b/plugins/cryptography/cryptographymessagehandler.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "cryptographymessagehandler.h"
-#include <kopete/kopetemessageevent.h>
+#include "kopetemessageevent.h"
 
 #include <kdebug.h>
 #include <QPointer>
diff --git a/plugins/cryptography/cryptographymessagehandler.h \
b/plugins/cryptography/cryptographymessagehandler.h index 544de65..c409de7 100644
--- a/plugins/cryptography/cryptographymessagehandler.h
+++ b/plugins/cryptography/cryptographymessagehandler.h
@@ -19,7 +19,7 @@
 #ifndef CRYPTOGRAPHY_MESSAGEHANDLER_H
 #define CRYPTOGRAPHY_MESSAGEHANDLER_H
 
-#include <kopete/kopetemessagehandler.h>
+#include "kopetemessagehandler.h"
 #include "cryptography_export.h"
 using namespace Kopete;
 
diff --git a/plugins/cryptography/cryptographyplugin.cpp \
b/plugins/cryptography/cryptographyplugin.cpp index 3783dca..a06c770 100644
--- a/plugins/cryptography/cryptographyplugin.cpp
+++ b/plugins/cryptography/cryptographyplugin.cpp
@@ -32,14 +32,15 @@
 #include <kactioncollection.h>
 
 // kopete stuff
-#include <kopete/kopetemetacontact.h>
-#include <kopete/kopetecontactlist.h>
-#include <kopete/kopetechatsessionmanager.h>
-#include <kopete/kopetesimplemessagehandler.h>
-#include <kopete/kopeteuiglobal.h>
-#include <kopete/kopetecontact.h>
-#include <kopete/kopeteprotocol.h>
-#include <kopete/kopetemessageevent.h>
+#include "kopetemetacontact.h"
+#include "kopetecontactlist.h"
+#include "kopetechatsessionmanager.h"
+#include "kopetesimplemessagehandler.h"
+#include "kopeteuiglobal.h"
+#include "kopetecontact.h"
+#include "kopeteprotocol.h"
+#include "kopetemessageevent.h"
+#include "kabcpersistence.h"
 
 // crypto stuff
 #include <kleo/cryptobackendfactory.h>
@@ -60,7 +61,6 @@
 
 // kabc stuff
 #include <kabc/addressbook.h>
-#include <kopete/kabcpersistence.h>
 
 // our own stuff
 #include "cryptographyselectuserkey.h"
diff --git a/plugins/cryptography/cryptographyplugin.h \
b/plugins/cryptography/cryptographyplugin.h index 0ccd138..1df2047 100644
--- a/plugins/cryptography/cryptographyplugin.h
+++ b/plugins/cryptography/cryptographyplugin.h
@@ -19,7 +19,7 @@
 #ifndef CRYPTOGRAPHYPLUGIN_H
 #define CRYPTOGRAPHYPLUGIN_H
 
-#include <kopete/kopeteplugin.h>
+#include "kopeteplugin.h"
 
 #include <QVariantList>
 #include <QHash>
diff --git a/plugins/cryptography/cryptographyselectuserkey.cpp \
b/plugins/cryptography/cryptographyselectuserkey.cpp index bfbe1b3..8d10563 100644
--- a/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -23,15 +23,15 @@
 #include <qlabel.h>
 #include <qboxlayout.h>
 
-#include <kopete/kopeteuiglobal.h>
+#include "kopeteuiglobal.h"
+#include "kopetemetacontact.h"
+#include "kabcpersistence.h"
 
 #include <kleo/ui/keyrequester.h>
 
-#include <kopete/kabcpersistence.h>
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
 
-#include <kopete/kopetemetacontact.h>
 #include "cryptographyplugin.h"
 
 CryptographySelectUserKey::CryptographySelectUserKey ( const QString& key \
                ,Kopete::MetaContact *mc )
diff --git a/plugins/cryptography/exportkeys.cpp \
b/plugins/cryptography/exportkeys.cpp index 8b1c210..7d8ffbd 100644
--- a/plugins/cryptography/exportkeys.cpp
+++ b/plugins/cryptography/exportkeys.cpp
@@ -22,8 +22,8 @@
 #include <kiconloader.h>
 #include <kpushbutton.h>
 
-#include <kopete/kopetemetacontact.h>
-#include <kopete/kabcpersistence.h>
+#include "kopetemetacontact.h"
+#include "kabcpersistence.h"
 
 #include "cryptographyplugin.h"
 


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