From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Sun, 26 Sep 2010 15:50:27 +0000 (+0000)
Subject: make zip lib structure more compliant with Qt standards
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5a2b3f627058d870b5db8fc5949efe46b1314ec5;p=web%2Fkonrad%2Fsmoke.git

make zip lib structure more compliant with Qt standards


git-svn-id: https://silmor.de/svn/softmagic/ziplib/trunk@589 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---

diff --git a/README b/README
index 10e5d54..4f3fe3d 100644
--- a/README
+++ b/README
@@ -11,23 +11,23 @@ ported to Qt4 by Konrad Rosenbaum, 2007-2010
 Build
 ------
 
-simply call "qmake && make" in this directory
+simply call "qmake && make" in the src directory
 
 A static library will be created. I recommend you leave the library as static,
 since dynamic libs may make some trouble, due to the fact that quite a few
-of them are called "libzip.so" or "zip.dll".
+of them are called "libqzip.so" or "qzip.dll".
 
 Usage
 ------
 
 Add something like this to your project file:
 
-LIBS += -L../zip -lzip
-INCLUDEPATH += ../zip
+LIBS += -L../zip -lQZip
+INCLUDEPATH += ../zip/include
 
 (replace "../zip" with the appropriate relative path to this directory)
 
-In your sources simply #include zip.h and/or unzip.h.
+In your sources simply do #include<QZip> and/or <QUnZip>.
 
 API docu
 ---------
diff --git a/include/QUnZip b/include/QUnZip
new file mode 100644
index 0000000..3b7ef62
--- /dev/null
+++ b/include/QUnZip
@@ -0,0 +1 @@
+#include "qunzip.h"
diff --git a/include/QZip b/include/QZip
new file mode 100644
index 0000000..8934d3e
--- /dev/null
+++ b/include/QZip
@@ -0,0 +1 @@
+#include "qzip.h"
diff --git a/qunzip.h b/include/qunzip.h
similarity index 98%
rename from qunzip.h
rename to include/qunzip.h
index 6e26c40..b096244 100644
--- a/qunzip.h
+++ b/include/qunzip.h
@@ -26,10 +26,10 @@
 #ifndef _QUNZIP_H
 #define _QUNZIP_H
 
-#include <qstring.h>
-#include <qiodevice.h>
-#include <qdatetime.h>
-#include <qbuffer.h>
+#include <QString>
+#include <QIODevice>
+#include <QDateTime>
+#include <QBuffer>
 
 /**
  * Class that exctract files from .zip archives. This class uses QIODevice
diff --git a/qzip.h b/include/qzip.h
similarity index 98%
rename from qzip.h
rename to include/qzip.h
index 16555a7..3e6b933 100644
--- a/qzip.h
+++ b/include/qzip.h
@@ -26,9 +26,9 @@
 #ifndef _QZIP_H
 #define _QZIP_H
 
-#include <qstring.h>
-#include <qiodevice.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QIODevice>
+#include <QDateTime>
 
 /**
  * Class that stores files to .zip archives. This class uses QIODevice
diff --git a/crypt.h b/src/crypt.h
similarity index 100%
rename from crypt.h
rename to src/crypt.h
diff --git a/ioapi.c b/src/ioapi.c
similarity index 100%
rename from ioapi.c
rename to src/ioapi.c
diff --git a/ioapi.h b/src/ioapi.h
similarity index 100%
rename from ioapi.h
rename to src/ioapi.h
diff --git a/qtioapi.cpp b/src/qtioapi.cpp
similarity index 100%
rename from qtioapi.cpp
rename to src/qtioapi.cpp
diff --git a/qtioapi.h b/src/qtioapi.h
similarity index 100%
rename from qtioapi.h
rename to src/qtioapi.h
diff --git a/qunzip.cpp b/src/qunzip.cpp
similarity index 100%
rename from qunzip.cpp
rename to src/qunzip.cpp
diff --git a/qzip.cpp b/src/qzip.cpp
similarity index 100%
rename from qzip.cpp
rename to src/qzip.cpp
diff --git a/unzip.c b/src/unzip.c
similarity index 100%
rename from unzip.c
rename to src/unzip.c
diff --git a/unzip.h b/src/unzip.h
similarity index 100%
rename from unzip.h
rename to src/unzip.h
diff --git a/zconf.h b/src/zconf.h
similarity index 100%
rename from zconf.h
rename to src/zconf.h
diff --git a/zip.c b/src/zip.c
similarity index 100%
rename from zip.c
rename to src/zip.c
diff --git a/zip.h b/src/zip.h
similarity index 100%
rename from zip.h
rename to src/zip.h
diff --git a/zip.pro b/src/zip.pro
similarity index 91%
rename from zip.pro
rename to src/zip.pro
index ed0a57a..d9e6dd1 100644
--- a/zip.pro
+++ b/src/zip.pro
@@ -28,8 +28,8 @@
 # Boston, MA 02111-1307, USA.
 
 TEMPLATE = lib
-TARGET = zip
-DESTDIR = ../zip
+TARGET = QZip
+DESTDIR = ..
 CONFIG += release staticlib create_prl
 OBJECTS_DIR = .ctmp
 MOC_DIR = .ctmp
@@ -48,5 +48,8 @@ HEADERS += \
 		unzip.h \
 		zip.h \
 		qtioapi.h \
-		qunzip.h \
-		qzip.h \
+		../include/qunzip.h \
+		../include/qzip.h \
+
+INCLUDEPATH += ../include
+DEPENDPATH += ../include
\ No newline at end of file
diff --git a/zlib.h b/src/zlib.h
similarity index 100%
rename from zlib.h
rename to src/zlib.h