- renaming source tree part one

diff --git a/src/zypper-keyring-callbacks.h b/src/callbacks/keyring.h
similarity index 99%
rename from src/zypper-keyring-callbacks.h
rename to src/callbacks/keyring.h
index e66c661..621b264 100644 (file)
--- a/src/zypper-keyring-callbacks.h
+++ b/src/callbacks/keyring.h
@@ -20,7 +20,7 @@
 #include "zypp/KeyRing.h"
 #include "zypp/Digest.h"
 
-#include "zypper-prompt.h"
+#include "../prompt.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp {

diff --git a/src/zypper-locks-callbacks.h b/src/callbacks/locks.h
similarity index 95%
rename from src/zypper-locks-callbacks.h
rename to src/callbacks/locks.h
index b6ce144..51572c2 100644 (file)
--- a/src/zypper-locks-callbacks.h
+++ b/src/callbacks/locks.h
@@ -7,9 +7,9 @@
 #include "zypp/ZYppCallbacks.h"
 #include "zypp/PoolQuery.h"
 
-#include "zypper-prompt.h"
-#include "zypper-utils.h"
-#include "output/prompt.h"
+#include "../prompt.h"
+#include "../utils.h"
+#include "../output/prompt.h"
 
 namespace zypp {
 

diff --git a/src/zypper-media-callbacks.h b/src/callbacks/media.h
similarity index 99%
rename from src/zypper-media-callbacks.h
rename to src/callbacks/media.h
index c4405bd..cf6abb2 100644 (file)
--- a/src/zypper-media-callbacks.h
+++ b/src/callbacks/media.h
@@ -20,9 +20,9 @@
 #include "zypp/Url.h"
 #include "zypp/media/MediaUserAuth.h"
 
-#include "zypper.h"
-#include "zypper-prompt.h"
-#include "output/prompt.h"
+#include "../Zypper.h"
+#include "../prompt.h"
+#include "../output/prompt.h"
 
 #define REPEAT_LIMIT 3
 

diff --git a/src/zypper-repo-callbacks.h b/src/callbacks/repo.h
similarity index 99%
rename from src/zypper-repo-callbacks.h
rename to src/callbacks/repo.h
index d7b3363..62a4cad 100644 (file)
--- a/src/zypper-repo-callbacks.h
+++ b/src/callbacks/repo.h
@@ -18,9 +18,9 @@
 #include "zypp/Pathname.h"
 #include "zypp/Url.h"
 
-#include "zypper.h"
-#include "zypper-prompt.h"
-#include "zypper-utils.h"
+#include "../Zypper.h"
+#include "../prompt.h"
+#include "../utils.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace ZmartRecipients

diff --git a/src/zypper-rpm-callbacks.h b/src/callbacks/rpm.h
similarity index 99%
rename from src/zypper-rpm-callbacks.h
rename to src/callbacks/rpm.h
index 6586928..3e7468c 100644 (file)
--- a/src/zypper-rpm-callbacks.h
+++ b/src/callbacks/rpm.h
@@ -21,8 +21,8 @@
 #include "zypp/Patch.h"
 //#include "zypp/target/rpm/RpmCallbacks.h"
 
-#include "zypper.h"
-#include "zypper-prompt.h"
+#include "../Zypper.h"
+#include "../prompt.h"
 
 using namespace std;