Conversion to the cmake building system.

Signed-off-by: gregory guy <[email protected]>
(cherry picked from commit 81b64bcfc0a32fdeb0e4f367adbf273d924e55f4)

16 files changed, 90 insertions, 36 deletions

diff --git a/src/upnp/CMakeLists.txt b/src/upnp/CMakeLists.txt
new file mode 100644
index 0000000..538f013
--- /dev/null
+++ b/src/upnp/CMakeLists.txt
@@ -0,0 +1,28 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ktupnp (static)
+
+tde_add_library( ktupnp STATIC_PIC AUTOMOC
+
+  SOURCES
+        soap.cpp
+        upnpdescriptionparser.cpp
+        upnpmcastsocket.cpp
+        upnprouter.cpp
+        portlist.cpp
+        httprequest.cpp
+        exitoperation.cpp
+        forwardportlist.cpp
+)
diff --git a/src/upnp/exitoperation.cpp b/src/upnp/exitoperation.cpp
index 6df1224..9a996c0 100644
--- a/src/upnp/exitoperation.cpp
+++ b/src/upnp/exitoperation.cpp
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
+
 #include "exitoperation.h"
 
 namespace kt
diff --git a/src/upnp/exitoperation.h b/src/upnp/exitoperation.h
index d969c6c..3afda7a 100644
--- a/src/upnp/exitoperation.h
+++ b/src/upnp/exitoperation.h
@@ -20,7 +20,8 @@
 #ifndef KTEXITOPERATION_H
 #define KTEXITOPERATION_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
+
 #include <tdeio/job.h>
 
 namespace kt
diff --git a/src/upnp/forwardportlist.cpp b/src/upnp/forwardportlist.cpp
index 906bde3..9714725 100644
--- a/src/upnp/forwardportlist.cpp
+++ b/src/upnp/forwardportlist.cpp
@@ -17,8 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include "forwardportlist.h"
+
 #include <kdebug.h>
+
+#include "forwardportlist.h"
+
 namespace net
 {
 	ForwardPort::ForwardPort() : extnumber(0),intnumber(0),proto(TCP),forward(false)
diff --git a/src/upnp/forwardportlist.h b/src/upnp/forwardportlist.h
index 5f8f9f7..d2d3c0c 100644
--- a/src/upnp/forwardportlist.h
+++ b/src/upnp/forwardportlist.h
@@ -20,7 +20,8 @@
 #ifndef FORWARDPORTLIST_H
 #define FORWARDPORTLIST_H
 
-#include <ntqvaluelist.h>
+#include <tqvaluelist.h>
+
 #include "../constants.h"
 #include "portlist.h"
 
diff --git a/src/upnp/httprequest.cpp b/src/upnp/httprequest.cpp
index bb411ca..a6c3e71 100644
--- a/src/upnp/httprequest.cpp
+++ b/src/upnp/httprequest.cpp
@@ -15,14 +15,16 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <ntqstringlist.h>
-#include "httprequest.h"
-#include "../functions.h"
+
+#include <tqstringlist.h>
+
 #include <kdebug.h>
 #include <ksocks.h>
 
+#include "httprequest.h"
+#include "../functions.h"
 
 namespace bt 
 {
diff --git a/src/upnp/httprequest.h b/src/upnp/httprequest.h
index 8c4496b..47428cd 100644
--- a/src/upnp/httprequest.h
+++ b/src/upnp/httprequest.h
@@ -20,9 +20,11 @@
 #ifndef BTHTTPREQUEST_H
 #define BTHTTPREQUEST_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
+
 #include <kurl.h>
 #include <kstreamsocket.h>
+
 #include "exitoperation.h"
 #include "../constants.h"
 
diff --git a/src/upnp/portlist.cpp b/src/upnp/portlist.cpp
index 56076ed..3ce5ac1 100644
--- a/src/upnp/portlist.cpp
+++ b/src/upnp/portlist.cpp
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
+
 #include "portlist.h"
 
 namespace net
diff --git a/src/upnp/portlist.h b/src/upnp/portlist.h
index 378127e..b8036e7 100644
--- a/src/upnp/portlist.h
+++ b/src/upnp/portlist.h
@@ -20,7 +20,8 @@
 #ifndef NETPORTLIST_H
 #define NETPORTLIST_H
 
-#include <ntqvaluelist.h>
+#include <tqvaluelist.h>
+
 #include "../constants.h"
 
 namespace net
diff --git a/src/upnp/soap.cpp b/src/upnp/soap.cpp
index c44ab1e..e6d2528 100644
--- a/src/upnp/soap.cpp
+++ b/src/upnp/soap.cpp
@@ -15,8 +15,9 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
+
 #include "soap.h"
 
 namespace kt 
diff --git a/src/upnp/soap.h b/src/upnp/soap.h
index cb766f0..6632342 100644
--- a/src/upnp/soap.h
+++ b/src/upnp/soap.h
@@ -20,8 +20,8 @@
 #ifndef KTSOAP_H
 #define KTSOAP_H
 
-#include <ntqvaluelist.h>
-#include <ntqstring.h>
+#include <tqvaluelist.h>
+#include <tqstring.h>
 
 namespace kt
 {
diff --git a/src/upnp/upnpdescriptionparser.cpp b/src/upnp/upnpdescriptionparser.cpp
index 7b40db7..286e614 100644
--- a/src/upnp/upnpdescriptionparser.cpp
+++ b/src/upnp/upnpdescriptionparser.cpp
@@ -15,16 +15,20 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <ntqxml.h>
-#include <ntqvaluestack.h>
-// #include <util/fileops.h>
+
+#include <tqxml.h>
+#include <tqvaluestack.h>
+
 #include <kdebug.h>
-// #include <torrent/globals.h>
+
 #include "upnprouter.h"
 #include "upnpdescriptionparser.h"
 
+// #include <util/fileops.h>
+// #include <torrent/globals.h>
+
 using namespace bt;
 
 namespace kt
diff --git a/src/upnp/upnpmcastsocket.cpp b/src/upnp/upnpmcastsocket.cpp
index ff87432..56df8fa 100644
--- a/src/upnp/upnpmcastsocket.cpp
+++ b/src/upnp/upnpmcastsocket.cpp
@@ -18,8 +18,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
+#include <tqstringlist.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+
+#include <tdesocketdevice.h>
+#include <tdesocketaddress.h>
 #include <kurl.h>
 #include <kdebug.h>
+
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -27,16 +34,11 @@
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <netinet/ip.h>
-#include <ntqstringlist.h>
-#include <tdesocketdevice.h>
-#include <tdesocketaddress.h>
-/*#include <util/log.h>
-#include <torrent/globals.h>*/
-#include <ntqfile.h>
-#include <ntqtextstream.h>
-#include "upnpmcastsocket.h"
 
+#include "upnpmcastsocket.h"
 
+/*#include <util/log.h>
+#include <torrent/globals.h>*/
 
 using namespace KNetwork;
 using namespace bt;
diff --git a/src/upnp/upnpmcastsocket.h b/src/upnp/upnpmcastsocket.h
index 23007fe..c7b7a3c 100644
--- a/src/upnp/upnpmcastsocket.h
+++ b/src/upnp/upnpmcastsocket.h
@@ -21,6 +21,7 @@
 #define KTUPNPMCASTSOCKET_H
 
 #include <kdatagramsocket.h>
+
 #include "../constants.h"
 #include "../functions.h"
 #include "upnprouter.h"
diff --git a/src/upnp/upnprouter.cpp b/src/upnp/upnprouter.cpp
index e5764b5..242dbe6 100644
--- a/src/upnp/upnprouter.cpp
+++ b/src/upnp/upnprouter.cpp
@@ -15,24 +15,28 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <stdlib.h>
+
+#include <tqstringlist.h>
+#include <tqdir.h>
+#include <tqfile.h>
+
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <ntqstringlist.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
+ 
+#include <stdlib.h>
+#include <fcntl.h>
+
 #include "httprequest.h"
 #include "upnprouter.h"
 #include "upnpdescriptionparser.h"
 #include "soap.h"
 #include "../functions.h"
-#include <fcntl.h>
-#include <ntqdir.h>
-#include <ntqfile.h>
 
 using namespace bt;
 using namespace net;
diff --git a/src/upnp/upnprouter.h b/src/upnp/upnprouter.h
index d0590b9..73463c9 100644
--- a/src/upnp/upnprouter.h
+++ b/src/upnp/upnprouter.h
@@ -20,13 +20,15 @@
 #ifndef KTUPNPROUTER_H
 #define KTUPNPROUTER_H
 
-#include <ntqtimer.h>
-#include <tdeio/job.h>
-#include <ntqvaluelist.h>
-#include "exitoperation.h"
+#include <tqtimer.h>
+#include <tqvaluelist.h>
+#include <tqstringlist.h>
+
 #include <kurl.h>
-#include <ntqstringlist.h>
 #include <kstreamsocket.h>
+#include <tdeio/job.h>
+
+#include "exitoperation.h"
 #include "portlist.h"
 #include "forwardportlist.h"