Try to sort out the horrible build mess.

Put all kleo headers under kleo/, and ui stuff in kleo/ui,
and adapt pim apps to look in these places, and don't include uic
generated headers in public headers.  Dashboard only knows if
I am doing the right thing.

CCMAIL:tomalbers@kde.nl


svn path=/trunk/KDE/kdepimlibs/kleo/; revision=687789

configuredialog.cpp

@@ -72,9 +72,9 @@ using KMail::IdentityDialog;
 using KMime::DateFormatter;
 #include <kleo/cryptoconfig.h>
 #include <kleo/cryptobackendfactory.h>
-#include <libkleoui/backendconfigwidget.h>
-#include <libkleoui/keyrequester.h>
-#include <libkleoui/keyselectiondialog.h>
+#include <kleo/ui/backendconfigwidget.h>
+#include <kleo/ui/keyrequester.h>
+#include <kleo/ui/keyselectiondialog.h>
 
 #include <mailtransport/transportmanagementwidget.h>
 using MailTransport::TransportManagementWidget;

encryptionconfigurationdialogimpl.cpp

@@ -1,6 +1,6 @@
 
 #include "encryptionconfigurationdialogimpl.h"
-#include <libkleo/cryptplugwrapper.h>
+#include <kleo/cryptplugwrapper.h>
 
 #include <q3buttongroup.h>
 #include <QRadioButton>

identitydialog.cpp

@@ -51,7 +51,7 @@ using KMail::FolderRequester;
 #include <kpimidentities/identity.h>
 #include <libkdepim/addresseelineedit.h>
 // libkleopatra:
-#include <libkleoui/keyrequester.h>
+#include <kleo/ui/keyrequester.h>
 #include <kleo/cryptobackendfactory.h>
 
 #include <kpimutils/email.h>

keyresolver.cpp

@@ -40,7 +40,7 @@
 #include "kleo_util.h"
 
 #include <kpimutils/email.h>
-#include <libkleoui/keyselectiondialog.h>
+#include <kleo/ui/keyselectiondialog.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/keylistjob.h>
 #include <kleo/dn.h>

keyresolver.h

@@ -37,7 +37,7 @@
 #ifndef __KLEO_KEYRESOLVER_H__
 #define __KLEO_KEYRESOLVER_H__
 
-#include <libkleoui/keyapprovaldialog.h>
+#include <kleo/ui/keyapprovaldialog.h>
 
 #include <kleo/enum.h>
 

kmcomposewin.cpp

@@ -68,8 +68,8 @@ using KRecentAddress::RecentAddresses;
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/exportjob.h>
 #include <kleo/specialjob.h>
-#include <libkleoui/progressdialog.h>
-#include <libkleoui/keyselectiondialog.h>
+#include <kleo/ui/progressdialog.h>
+#include <kleo/ui/keyselectiondialog.h>
 
 #include <mailtransport/transportcombobox.h>
 #include <mailtransport/transportmanager.h>

kmmessage.cpp

@@ -29,7 +29,7 @@ using KMail::TemplateParser;
 #include <kpimidentities/identitymanager.h>
 #include <kpimutils/email.h>
 
-#include <libkleo/cryptplugwrapperlist.h>
+#include <kleo/cryptplugwrapperlist.h>
 #include <libkpgp/kpgpblock.h>
 #include <kaddrbook.h>
 

messagecomposer.cpp

@@ -55,8 +55,8 @@
 #include <kpimidentities/identity.h>
 #include <kpimidentities/identitymanager.h>
 
-#include <libkleoui/keyselectiondialog.h>
-#include <libkleoui/keyapprovaldialog.h>
+#include <kleo/ui/keyselectiondialog.h>
+#include <kleo/ui/keyapprovaldialog.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/keylistjob.h>
 #include <kleo/encryptjob.h>

objecttreeparser.cpp

@@ -50,8 +50,8 @@
 #include "globalsettings.h"
 #include "util.h"
 
-#include "libkleo/cryptplugwrapperlist.h"
-#include "libkleo/cryptplugfactory.h"
+#include "kleo/cryptplugwrapperlist.h"
+#include "kleo/cryptplugfactory.h"
 
 // other module headers
 #include <mimelib/enum.h>

objecttreeparser.h

@@ -35,7 +35,7 @@
 
 #include "kmmsgbase.h"
 
-#include <libkleo/cryptplugwrapper.h>
+#include <kleo/cryptplugwrapper.h>
 
 class KMReaderWin;
 class KMMessagePart;

partmetadata.h

@@ -17,7 +17,7 @@
 #ifndef _KMAIL_PARTMETADATA_H_
 #define _KMAIL_PARTMETADATA_H_
 
-#include <libkleo/cryptplugwrapper.h>
+#include <kleo/cryptplugwrapper.h>
 
 #include <libkpgp/kpgp.h>
 #include <QString>

signatureconfigurationdialogimpl.cpp

@@ -1,6 +1,6 @@
 #include "signatureconfigurationdialogimpl.h"
 
-#include <libkleo/cryptplugwrapper.h>
+#include <kleo/cryptplugwrapper.h>
 
 #include <q3buttongroup.h>
 #include <QRadioButton>

smimeconfiguration.ui

@@ -328,7 +328,7 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
   <customwidgets>
     <customwidget>
       <class>Kleo::KeyRequester</class>
-      <header location="global" >libkleo/ui/keyrequester.h</header>
+      <header location="global" >kleo/ui/keyrequester.h</header>
       <sizehint>
         <width>-1</width>
         <height>-1</height>
@@ -341,7 +341,7 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP
     </customwidget>
   </customwidgets>
   <includes>
-    <include location="local" >ui/keyrequester.h</include>
+      <include location="local" >kleo/ui/keyrequester.h</include>
   </includes>
   <connections>
     <connection>