reorganize kgpg source tree

git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2-mac@931 34ebc366-c3a9-4b3c-9f84-69acf7962910

40 files changed, 46 insertions, 71 deletions

diff --git a/gpg4usb.pro b/gpg4usb.pro
index f82b9d9..84bc18c 100644
--- a/gpg4usb.pro
+++ b/gpg4usb.pro
@@ -46,22 +46,22 @@ HEADERS += attachments.h \
     kgpg/kprocess.h \
     kgpg/kprocess_p.h \
     kgpg/kgpginterface.h \
-    kgpg/kgpgkey.h \
-    kgpg/KGpgSignableNode.h \
-    kgpg/KGpgExpandableNode.h \
-    kgpg/KGpgSignNode.h \
-    kgpg/KGpgUidNode.h \
-    kgpg/KGpgUatNode.h \
-    kgpg/KGpgKeyNode.h \
-    kgpg/KGpgSubKeyNode.h \
-    kgpg/KGpgNode.h \
-    kgpg/KGpgRefNode.h \
-    kgpg/KGpgRootNode.h \
-    kgpg/KGpgGroupNode.h \
-    kgpg/KGpgGroupMemberNode.h \
-    kgpg/KGpgOrphanNode.h \
-    kgpg/convert.h \
-    kgpg/images.h \
+    kgpg/core/kgpgkey.h \
+    kgpg/core/KGpgSignableNode.h \
+    kgpg/core/KGpgExpandableNode.h \
+    kgpg/core/KGpgSignNode.h \
+    kgpg/core/KGpgUidNode.h \
+    kgpg/core/KGpgUatNode.h \
+    kgpg/core/KGpgKeyNode.h \
+    kgpg/core/KGpgSubKeyNode.h \
+    kgpg/core/KGpgNode.h \
+    kgpg/core/KGpgRefNode.h \
+    kgpg/core/KGpgRootNode.h \
+    kgpg/core/KGpgGroupNode.h \
+    kgpg/core/KGpgGroupMemberNode.h \
+    kgpg/core/KGpgOrphanNode.h \
+    kgpg/core/convert.h \
+    kgpg/core/images.h \
     gpgconstants.h
 
 SOURCES += attachments.cpp \
@@ -91,22 +91,22 @@ SOURCES += attachments.cpp \
     kgpg/klinebufferedprocess.cpp \
     kgpg/kprocess.cpp \
     kgpg/kgpginterface.cpp \
-    kgpg/kgpgkey.cpp \
-    kgpg/KGpgSignableNode.cpp \
-    kgpg/KGpgExpandableNode.cpp \
-    kgpg/KGpgSignNode.cpp \
-    kgpg/KGpgUidNode.cpp \
-    kgpg/KGpgUatNode.cpp \
-    kgpg/KGpgKeyNode.cpp \
-    kgpg/KGpgSubKeyNode.cpp \
-    kgpg/KGpgNode.cpp \
-    kgpg/KGpgRefNode.cpp \
-    kgpg/KGpgRootNode.cpp \
-    kgpg/KGpgGroupNode.cpp \
-    kgpg/KGpgGroupMemberNode.cpp \
-    kgpg/KGpgOrphanNode.cpp \
-    kgpg/convert.cpp \
-    kgpg/images.cpp \
+    kgpg/core/kgpgkey.cpp \
+    kgpg/core/KGpgSignableNode.cpp \
+    kgpg/core/KGpgExpandableNode.cpp \
+    kgpg/core/KGpgSignNode.cpp \
+    kgpg/core/KGpgUidNode.cpp \
+    kgpg/core/KGpgUatNode.cpp \
+    kgpg/core/KGpgKeyNode.cpp \
+    kgpg/core/KGpgSubKeyNode.cpp \
+    kgpg/core/KGpgNode.cpp \
+    kgpg/core/KGpgRefNode.cpp \
+    kgpg/core/KGpgRootNode.cpp \
+    kgpg/core/KGpgGroupNode.cpp \
+    kgpg/core/KGpgGroupMemberNode.cpp \
+    kgpg/core/KGpgOrphanNode.cpp \
+    kgpg/core/convert.cpp \
+    kgpg/core/images.cpp \
     gpgconstants.cpp
 
 RC_FILE = gpg4usb.rc
diff --git a/gpgcontext.cpp b/gpgcontext.cpp
index aa2c3da..f87ed11 100644
--- a/gpgcontext.cpp
+++ b/gpgcontext.cpp
@@ -23,7 +23,7 @@
 #include "kgpg/gpgproc.h"
 #include "kgpg/kgpginterface.h"
 #include "kgpg/klinebufferedprocess.h"
-#include "kgpg/kgpgkey.h"
+#include "kgpg/core/kgpgkey.h"
 #ifdef _WIN32
 #include <windows.h>
 #include <unistd.h>    /* contains read/write */
@@ -194,19 +194,6 @@ bool GpgContext::exportKeys(QStringList *uidList, QByteArray *outBuffer)
     return true;
 }
 
-/*gpgme_key_t GpgContext::getKeyDetails(QString uid)
-{
-    gpgme_key_t key;
-
-    // try secret
-    gpgme_get_key(mCtx, uid.toAscii().constData(), &key, 1);
-    // ok, its a public key
-    if (!key) {
-        gpgme_get_key(mCtx, uid.toAscii().constData(), &key, 0);
-    }
-    return key;
-}*/
-
 KgpgCore::KgpgKey GpgContext::getKeyDetails(QString uid) {
 
     //KgpgCore::KgpgKey key;
diff --git a/gpgcontext.h b/gpgcontext.h
index 7bb9a4b..ba4cf67 100644
--- a/gpgcontext.h
+++ b/gpgcontext.h
@@ -28,7 +28,7 @@
 #include <gpgme.h>
 #include <QLinkedList>
 #include <QtGui>
-#include "kgpg/kgpgkey.h"
+#include "kgpg/core/kgpgkey.h"
 
 QT_BEGIN_NAMESPACE
 class QMessageBox;
diff --git a/keydetailsdialog.h b/keydetailsdialog.h
index a13257e..e0893c2 100644
--- a/keydetailsdialog.h
+++ b/keydetailsdialog.h
@@ -23,7 +23,7 @@
 #define __KEYDETAILSDIALOG_H__
 
 #include "gpgcontext.h"
-#include "kgpg/kgpgkey.h"
+#include "kgpg/core/kgpgkey.h"
 #include <gpgme.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/kgpg/KGpgExpandableNode.cpp b/kgpg/core/KGpgExpandableNode.cpp
index 4cf9607..4cf9607 100644
--- a/kgpg/KGpgExpandableNode.cpp
+++ b/kgpg/core/KGpgExpandableNode.cpp
diff --git a/kgpg/KGpgExpandableNode.h b/kgpg/core/KGpgExpandableNode.h
index 39f351d..39f351d 100644
--- a/kgpg/KGpgExpandableNode.h
+++ b/kgpg/core/KGpgExpandableNode.h
diff --git a/kgpg/KGpgGroupMemberNode.cpp b/kgpg/core/KGpgGroupMemberNode.cpp
index e7a9f97..e7a9f97 100644
--- a/kgpg/KGpgGroupMemberNode.cpp
+++ b/kgpg/core/KGpgGroupMemberNode.cpp
diff --git a/kgpg/KGpgGroupMemberNode.h b/kgpg/core/KGpgGroupMemberNode.h
index 2a456ef..2a456ef 100644
--- a/kgpg/KGpgGroupMemberNode.h
+++ b/kgpg/core/KGpgGroupMemberNode.h
diff --git a/kgpg/KGpgGroupNode.cpp b/kgpg/core/KGpgGroupNode.cpp
index 3475303..3475303 100644
--- a/kgpg/KGpgGroupNode.cpp
+++ b/kgpg/core/KGpgGroupNode.cpp
diff --git a/kgpg/KGpgGroupNode.h b/kgpg/core/KGpgGroupNode.h
index 5aca837..5aca837 100644
--- a/kgpg/KGpgGroupNode.h
+++ b/kgpg/core/KGpgGroupNode.h
diff --git a/kgpg/KGpgKeyNode.cpp b/kgpg/core/KGpgKeyNode.cpp
index 285c8f1..4e5fb55 100644
--- a/kgpg/KGpgKeyNode.cpp
+++ b/kgpg/core/KGpgKeyNode.cpp
@@ -24,7 +24,7 @@
 #include "KGpgUatNode.h"
 #include "KGpgUidNode.h"
 #include "convert.h"
-#include "kgpginterface.h"
+#include "../kgpginterface.h"
 //#include "kgpgsettings.h"
 //#include "model/kgpgitemmodel.h"
 
diff --git a/kgpg/KGpgKeyNode.h b/kgpg/core/KGpgKeyNode.h
index caf0ba4..caf0ba4 100644
--- a/kgpg/KGpgKeyNode.h
+++ b/kgpg/core/KGpgKeyNode.h
diff --git a/kgpg/KGpgNode.cpp b/kgpg/core/KGpgNode.cpp
index 18645f8..18645f8 100644
--- a/kgpg/KGpgNode.cpp
+++ b/kgpg/core/KGpgNode.cpp
diff --git a/kgpg/KGpgNode.h b/kgpg/core/KGpgNode.h
index 1d89875..1d89875 100644
--- a/kgpg/KGpgNode.h
+++ b/kgpg/core/KGpgNode.h
diff --git a/kgpg/KGpgOrphanNode.cpp b/kgpg/core/KGpgOrphanNode.cpp
index f245121..f245121 100644
--- a/kgpg/KGpgOrphanNode.cpp
+++ b/kgpg/core/KGpgOrphanNode.cpp
diff --git a/kgpg/KGpgOrphanNode.h b/kgpg/core/KGpgOrphanNode.h
index e3b6132..e3b6132 100644
--- a/kgpg/KGpgOrphanNode.h
+++ b/kgpg/core/KGpgOrphanNode.h
diff --git a/kgpg/KGpgRefNode.cpp b/kgpg/core/KGpgRefNode.cpp
index a67d6b5..a67d6b5 100644
--- a/kgpg/KGpgRefNode.cpp
+++ b/kgpg/core/KGpgRefNode.cpp
diff --git a/kgpg/KGpgRefNode.h b/kgpg/core/KGpgRefNode.h
index f977567..f977567 100644
--- a/kgpg/KGpgRefNode.h
+++ b/kgpg/core/KGpgRefNode.h
diff --git a/kgpg/KGpgRootNode.cpp b/kgpg/core/KGpgRootNode.cpp
index 416aa0a..9ceb571 100644
--- a/kgpg/KGpgRootNode.cpp
+++ b/kgpg/core/KGpgRootNode.cpp
@@ -19,7 +19,7 @@
 #include "KGpgRootNode.h"
 
 #include "KGpgGroupNode.h"
-#include "kgpginterface.h"
+#include "../kgpginterface.h"
 #include "KGpgOrphanNode.h"
 //#include "kgpgsettings.h"
 
diff --git a/kgpg/KGpgRootNode.h b/kgpg/core/KGpgRootNode.h
index 97c597c..97c597c 100644
--- a/kgpg/KGpgRootNode.h
+++ b/kgpg/core/KGpgRootNode.h
diff --git a/kgpg/KGpgSignNode.cpp b/kgpg/core/KGpgSignNode.cpp
index f35bd9a..f35bd9a 100644
--- a/kgpg/KGpgSignNode.cpp
+++ b/kgpg/core/KGpgSignNode.cpp
diff --git a/kgpg/KGpgSignNode.h b/kgpg/core/KGpgSignNode.h
index 398ee57..398ee57 100644
--- a/kgpg/KGpgSignNode.h
+++ b/kgpg/core/KGpgSignNode.h
diff --git a/kgpg/KGpgSignableNode.cpp b/kgpg/core/KGpgSignableNode.cpp
index e3782c1..e3782c1 100644
--- a/kgpg/KGpgSignableNode.cpp
+++ b/kgpg/core/KGpgSignableNode.cpp
diff --git a/kgpg/KGpgSignableNode.h b/kgpg/core/KGpgSignableNode.h
index fddae25..fddae25 100644
--- a/kgpg/KGpgSignableNode.h
+++ b/kgpg/core/KGpgSignableNode.h
diff --git a/kgpg/KGpgSubkeyNode.cpp b/kgpg/core/KGpgSubkeyNode.cpp
index 571ca35..571ca35 100644
--- a/kgpg/KGpgSubkeyNode.cpp
+++ b/kgpg/core/KGpgSubkeyNode.cpp
diff --git a/kgpg/KGpgSubkeyNode.h b/kgpg/core/KGpgSubkeyNode.h
index bbe5ab8..bbe5ab8 100644
--- a/kgpg/KGpgSubkeyNode.h
+++ b/kgpg/core/KGpgSubkeyNode.h
diff --git a/kgpg/KGpgUatNode.cpp b/kgpg/core/KGpgUatNode.cpp
index 3457e82..174db66 100644
--- a/kgpg/KGpgUatNode.cpp
+++ b/kgpg/core/KGpgUatNode.cpp
@@ -18,7 +18,7 @@
  */
 #include "KGpgUatNode.h"
 
-#include "gpgproc.h"
+#include "../gpgproc.h"
 #include "KGpgKeyNode.h"
 
 //#include <KLocale>
diff --git a/kgpg/KGpgUatNode.h b/kgpg/core/KGpgUatNode.h
index b4c6775..b4c6775 100644
--- a/kgpg/KGpgUatNode.h
+++ b/kgpg/core/KGpgUatNode.h
diff --git a/kgpg/KGpgUidNode.cpp b/kgpg/core/KGpgUidNode.cpp
index 0be6c10..0be6c10 100644
--- a/kgpg/KGpgUidNode.cpp
+++ b/kgpg/core/KGpgUidNode.cpp
diff --git a/kgpg/KGpgUidNode.h b/kgpg/core/KGpgUidNode.h
index cd1b563..cd1b563 100644
--- a/kgpg/KGpgUidNode.h
+++ b/kgpg/core/KGpgUidNode.h
diff --git a/kgpg/convert.cpp b/kgpg/core/convert.cpp
index 934ec02..934ec02 100644
--- a/kgpg/convert.cpp
+++ b/kgpg/core/convert.cpp
diff --git a/kgpg/convert.h b/kgpg/core/convert.h
index 96043a8..96043a8 100644
--- a/kgpg/convert.h
+++ b/kgpg/core/convert.h
diff --git a/kgpg/images.cpp b/kgpg/core/images.cpp
index c63dceb..c63dceb 100644
--- a/kgpg/images.cpp
+++ b/kgpg/core/images.cpp
diff --git a/kgpg/images.h b/kgpg/core/images.h
index 739a618..739a618 100644
--- a/kgpg/images.h
+++ b/kgpg/core/images.h
diff --git a/kgpg/kgpgkey.cpp b/kgpg/core/kgpgkey.cpp
index 57ed820..57ed820 100644
--- a/kgpg/kgpgkey.cpp
+++ b/kgpg/core/kgpgkey.cpp
diff --git a/kgpg/kgpgkey.h b/kgpg/core/kgpgkey.h
index f16907c..f16907c 100644
--- a/kgpg/kgpgkey.h
+++ b/kgpg/core/kgpgkey.h
diff --git a/kgpg/kgpg.pro b/kgpg/kgpg.pro
deleted file mode 100644
index 7dd6391..0000000
--- a/kgpg/kgpg.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Aug 1 23:46:35 2012
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += gpgproc.h klinebufferedprocess.h kprocess.h kprocess_p.h
-SOURCES += gpgproc.cpp klinebufferedprocess.cpp kprocess.cpp
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 90dea2d..0c14b33 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -15,12 +15,12 @@
 #include "kgpginterface.h"
 
 #include "gpgproc.h"
-#include "convert.h"
-#include "KGpgKeyNode.h"
-#include "KGpgSignNode.h"
-#include "KGpgSubkeyNode.h"
-#include "KGpgUatNode.h"
-#include "KGpgUidNode.h"
+#include "core/convert.h"
+#include "core/KGpgKeyNode.h"
+#include "core/KGpgSignNode.h"
+#include "core/KGpgSubkeyNode.h"
+#include "core/KGpgUatNode.h"
+#include "core/KGpgUidNode.h"
 
 /*#include <KConfig>
 #include <KDebug>
diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h
index 7a289ec..1ed0e53 100644
--- a/kgpg/kgpginterface.h
+++ b/kgpg/kgpginterface.h
@@ -15,7 +15,7 @@
 #ifndef KGPGINTERFACE_H
 #define KGPGINTERFACE_H
 
-#include "kgpgkey.h"
+#include "core/kgpgkey.h"
 #include <QStringList>
 
 class KGpgKeyNode;
diff --git a/mainwindow.h b/mainwindow.h
index 79928af..6df5ab4 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -30,7 +30,7 @@
 #include "settingsdialog.h"
 #include "verifynotification.h"
 #include "wizard.h"
-#include "kgpg/kgpgkey.h"
+#include "kgpg/core/kgpgkey.h"
 
 QT_BEGIN_NAMESPACE
 class QMainWindow;